Fix tests to cleanup after themselves.