Improving CLI test coverage.