CFY-1185 fix tests