CFY-1746 fix tests