GROOVY-6624: prefactor work (test change for previous commit)