Fixing tests by renaming packages