Lots of changes to schema and test xml file