Added 3 more tests.
Made TODO more clear.
Merge pull request #93 from Hudon/3-more-tests

Added 3 more tests.