Fix up the xml schema collection integration tests.