Merge "Updated test harness behaviour" into tizen