Fix tests broken by fix to 1134879, PackageName objects should be saved explicitly