BATCH-1745 - removed excessive schema, added test and cleaned up schema
mappings