Added test cases for the entity-mapping, subclassing, filter defs etc.