add a few more tests, all pass
Merge pull request #1 from wwood/master

add a few more tests, all pass