Added some additional test coverage.