Tweaking the tests to improve readability.
Updating TODO with more things to do.