Updated tests to clean up after themselves