Add cleaner tests