continue refactor of coverage report calculations