fix up the requires to use the utils module
drop unused imports from the test
break up the tests into similar modules