Additional test coverage and test case renames.

+review REVIEW-5257