Added additional test coverage.