fix browser flows & cli parsing from tests

Change-Id: Ibc61b84ce049822ff6984e18db8990a2d7eb9aba