CFY-1318 fix tests