Improved code coverage.