Added cleaner tests