KFSUPGRADE-1002 Fix tests