Further extend test coverage.