Removed unused import
More basic tests
Cleanup test