Improve coverage.
Merge pull request #158 from Aigeruth/improvement/coverage

Improve coverage.