Coverage increase (close #30)
Merge pull request #31 from enb-make/coverage

[WIP] Coverage increase (close #30)