Fixed issue with test
Cleaned up imports and formatted code