Bug 16083: [QA FOLLOWUP] Add more cli arguments.