[tests] Make failures more descriptive and fix XA