XML fix and test