cleaner tests, fix one unit test