Improve pairwise tests.