clean up cond a bit
cleanup test-utils and todos