GRAILS-11247 - fix failing tests

The tests expressed incorrect expectations
Merge branch '2.3.x'