added fixes for Schema Mapping / added tests for schema mapping