Fix up the last of the test suite
Merge pull request #2 from mrb/master

Fix up final tests