Handle test for affinity more generically
Remove (hopefully) unneeded check in test