More test coverage for CLI