Improve test coverage
Merge pull request #112 from megawac/coverage

Improve test coverage