Remove unused imports
Remove unused imports
Add tests