Improving coverage tooling
Merge pull request #1312 from danmcp/master

Improving coverage tooling