Fix a leak and a buglet discovered by Thomas.

Get rid of silly lambdas in the unit test suite.
Add a TODO list to the unit test suite (TDD style).