Fix XML tests

    Fix XML tests