Fix failing tests in 2.6 and 3.3