Merge "Provide a new command line for host tests" into sc-dev