I’d say some of the tests definitely look wrong.

In `#resolveIdentifier` what specifically do you think is wrong? You mean that `isProxyUnwrapEnabled`}}is set incorrectly? Have you played with what the conditions ought to be. My guess is something with {{org.hibernate.type.EntityType#unwrapProxy