accountClientSvc testing and refactor.