Fixing tests, package names, etc