CFY-606 fix tests