Fix the destroy method and cleanup the tests.