GRAILS-10853 - fix broken tests to be consistent with actual expectations