Added todo notes.
Improved tests.