Fixed bug in test suite
Removed unnecessary imports