added cleaner tests