Removing unused imports
Renaming test class