reorganized the schema.xml files used for testing