GRAILS-11625 - few more conditionals added to spec