Merge "Fix PackageParser tests" into pi-dev