clean up tests, remove unused code and deps
all tests passing accept for partial helper tests