CFY-1128 fix tests