Correct the packages that get recorded by coverage.
Capture all code with coverage.
Merge branch 'rbarlow-fix_coverage'