Fix some failing tests with Grails 2.3