Added more test coverage.