Final touches for new coverage calculator and unit tests