Added some tests and TODOs
Merge pull request #1 from cowmanifestation/master

Added some tests and TODOs