Further improved test coverage.