Merge "Fix test harness mode" into sc-dev