Merge "teststeps: Improvements of step driven TC"