create JSON encoding on CompanyClient and updated test cases