Cleaning up more tests