Expanded class hierarchy of EntityPropertiesTest