Improved CLI Integration Test

- Uses `waitFor`
- Parent class with test framework/DSL