More re-package and test package stuff