Tidying up test for readability

+review REVIEW-5100