[WIP] More 2.6 test fixes