Updated CliIntegrationTest with waitFor
Created separate base class for CLI integration tests to lower code duplication
Merge pull request #602 from grkvlt/cli-integration-test

Improved CLI Integration Test