Remove unused imports
Rename test that had duplicate name