Improved test coverage.
Merge pull request #22 from ByteBlast/master

Improved test coverage.