Updated test cases for the following:

The parent hbm file and its entity-mapped hbm file should have
entity-name tag. All the persistency APIs should use the entity-name. In
addition any associations to and from these hbm files should use the
entity-name, instead of class name

Discrimination column for entity-mapped hbm and its parent hbm cannot be
the same.