fix up the package-list to be more testable (and add tests)