Add use of affinity to the test.
Merge remote-tracking branch 'origin/master'