CFY-785 fix tests