update the package to be actually a little informative
update tests for refactoring