adding more tests, and renaming packages.