CFY-1179 fix tests