More unit tests for Client and CommandGenerators.