Fixed bug where tie breaking One Pair gave the wrong winner (added test case for this).

Similar code was used elsewhere, so although the result now comes back
correct, this should be looked into.