Added test coverage support
Merge branch 'feature/coverage'