and fix the cleaner tests...