fix tdd errors after merge