CFY-749 fix tests