GRAILS-11044 - simplify unit test
Merge branch '2.3.x'