GROOVY-6150: small tweaks, new tests