Fix tests + add missing tests affinitic refs #5837