Merge "Fix cmdline parser test."