fix up tests on 2.6