Some additional test cases and cleanups
Merge pull request #12 from jasnell/testcases

Some additional test cases and cleanups