GRAILS-10166 - Add tests for embedded property queries; fix NPE in test