Merge "Add unit tests for cli.output_parser"