remove unused imports, format tests to project standards

Fall cleaning - Tiding up the code to more closely follow our other projects