GROOVY-6354: minor refactor (keep tests together)
GROOVY-6354: minor refactor (keep tests together)