more cleanup of tests
more cleanup of tests