clean todo
a few clean todo tests