Move TestUtils one package up.
Start CleanerTest.
Fix off-by-one bug in Cleaner.

Discovered by tests.