CFY-1195 fix tests