More work on the xml integration tests.