Ok, more fixes to 2.6, 3.2+ tests.