More tests

Add some more tests. Follows/builds off of PR #10.