I integrated the original test in the PR here: https://github.com/hibernate/hibernate-orm/pull/2390
We need to decide if we still want to keep the UNFETCHED_PROPERTY code in the types or get rid of it and use the other approach (or both).