More Xml schema test improvements