Fixing some of the xml schema errors in test-xsd.xml