first stab at fixing up the tests
more test cleanup