Fix XML exporter tests (again and again)