Merge "Fix some PackageManagerTests."