remove unused imports, format tests to project standards
Merge pull request #272 from m8ttyB/cleanup

remove unused imports, format tests to project standards