Simplify the Shape API + implementation and MapperTest

testWideMappedEntity is much simpler now with the new table definitions
based on ProvenShape and it can do proper bidirectional mappings.