REVIEW-4260: Added more test coverage.