work on refactoring tests
more cleanup