GRAILS-10031 - rearrange unit test