Fix DatabaseCleaner to clean properly