Fix tests Affinitic refs #5928