KFSUPGRADE-1002 fix tests