TST: fixes for 2.6 comparisons