fix for GRAILS-8902 "withCriteria(uniqueResult: true) is ignored in @Mock based unit tests"

Also correct that fact that "withCriteria" was not running within a datastore 'execute' block