Clean up some more tests