More clean up of test_pairwise.py.