Fix 2.6 tests