GRAILS-11492 - make the tests 1.6 compatible