Adding support for code-coverage