clean up some more tests