Fixing tests
Removing unused imports