V2.6 test fixes

@ndushay