update cleaner and tests