Change unit test to only look at proper pairs
Merge remote-tracking branch: upstream/master