Adapts tests to improved compatibility of XML/XSD