got the tests passing again and added cleaner class