Fix robot tests Affinitic refs #5910