Remove dead code in test.
Clarify TODO.