Minor improvements to test for clarity

+review REVIEW-5100