Improved test coverage
Merge pull request #3 from cadmus/bug/test-coverage

Improved test coverage