Align Xtesting based jobs with latest XtestingCI changes