Cleaning up tests to remove pollution