start refactoring tests
add cruft :(