Fix tests with new comparisons affinitic refs #5837