CMS-3203 Make test code align with test name