rename cleaner and drop tests