TestCommandLineClientIntegrationTest refactored