Improved unit test code coverage.