Minor change to wording.
Add tests to TODO section.