Merge "Fix package parsing equivalence test comparisons"