Improved test coverage.