package name changes. start adding tests.