Improved test coverage.
Improve code coverage report accuracy.