CFY-443 fixed CLI's mock rest client and mock providers