Merge "Prepare base test class for CLI tests"