Merge "Fixes majority of PackageManagerTests" into rvc-dev