PR-58: Adds missing tests
Merge pull request #60 from jeremytregunna/pr/58

PR-58: Adds missing tests