Merge "Clean up test code for package manager."