#769120 fix entity loading for exportables such that defaults are always overridden, improved tests to cover passing conditions.