Improvements to code coverage.