Fix a couple of issues in test-xsd.xml.
(Some issues remain - especially, inter-testcase type references.)