Merge "Expand CLI test"