diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index 33d6ab2fd..672e58416 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -523,7 +523,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
index 4b5828e50..d37cf0f7c 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
@@ -1042,7 +1042,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                 do
                 {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
index 1ba1c42d8..0a7a9c293 100644
--- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
@@ -686,7 +686,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
index f40b6f2f6..07f5c69ee 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
@@ -855,7 +855,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                     .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }	/// TODO: this is an endless loop !!!
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }	/// TODO: this is an endless loop !!!
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
index 7ba1ce705..61693fccb 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
@@ -1000,7 +1000,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                     .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }	/// TODO: this is an endless loop !!!
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }	/// TODO: this is an endless loop !!!
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 71376585b..5d4b12d9b 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -1220,7 +1220,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                     .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
index 9b0a17ef8..7b2fe58f7 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
@@ -882,7 +882,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                 do
                 {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 05137d16e..72590364a 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -724,8 +724,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
-                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
             }
             while (!e.Contains(Event.FlowRegulationStopped));
 
diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
index 60c3189b2..bf10c03cf 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
@@ -474,7 +474,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
index f3054031d..b14ceea19 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
@@ -302,7 +302,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
index e6c94c40f..962a37c7e 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
@@ -517,7 +517,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
index b88a22996..6a0eb07e7 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
@@ -508,7 +508,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
                 }
                 while (!e.Contains(Event.PreviousStopped));
             }