Resolves #45
Merge pull request #46 from lob/fix-test-cases

Resolves #45