Slightly improved test coverage.