Complete CompanyClientDAO and relevent test cases