minor fixes, unused imports
removing unused imports in test classes