Add XML tests too