Merge "Fix package manager tests"