Remove duplicated cleanup in tests