refactors tests; removes some unused imports