[#2003] smaller, simpler, new_test for package_patch