Improved unit test coverage.