Killed off more TODO exceptions -- no test fails with such an exception
(but none succeeds either).