package: Improved packaging functions so we could test faster