Reformat optional arguments passed cli tests to make them easier to read

keep on the same line the option flagand the argument.

Depends on !132 (closed)

---

Migrated from D4433 (view on Phabricator)