Improve coverage.
Merge pull request #29 from johnmarkos/coverage

Improve coverage.