GRAILS-10220 - more tests