diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
index 718c04a31..f40f361cb 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
@@ -272,7 +272,10 @@ ulong valvesToInvert,
             {
                 /// SendCommand() arguments to clear the emergency stop state
                 sendCommandFlag = true;
+                this.refNr = 0;
+                this.refPulses = 0;
                 this.cmd = Command.Stop;
+                this.testMethods = 0;
                 this.stopDevs = StopDevs.All;
             }
             else if (scheduleDiverterToTank)
@@ -280,6 +283,9 @@ ulong valvesToInvert,
                 /// Reset all SendCommand() arguments
                 sendCommandFlag = true;
                 this.cmd = Command.Start;
+                this.refNr = flowmeterNr4DiverterTest;
+                this.refPulses = int.MaxValue;
+                this.testMethods = TestMethods.Diverter;
                 this.stopDevs = 0;
 				scheduleDiverterToTank = false;
 			}
@@ -288,7 +294,10 @@ ulong valvesToInvert,
 				/// Reset all SendCommand() arguments
 				sendCommandFlag = true;
 				this.cmd = Command.Stop;
-				this.stopDevs = StopDevs.Diverter;
+                this.refNr = flowmeterNr4DiverterTest;
+                this.refPulses = 0;
+                this.testMethods = TestMethods.Diverter;
+                this.stopDevs = StopDevs.Diverter;
 				scheduleDiverterToSink = false;
 			}
 			else if (scheduleReadDiverterTransition)
@@ -296,7 +305,10 @@ ulong valvesToInvert,
 				/// Reset all SendCommand() arguments
 				sendCommandFlag = true;
 				this.cmd = Command.ReadDivTransition;
-				this.stopDevs = 0;
+                this.refNr = flowmeterNr4DiverterTest;
+                this.refPulses = 0;
+                this.testMethods = TestMethods.Diverter;
+                this.stopDevs = 0;
 				scheduleReadDiverterTransition = false;
 			}
 			else
@@ -304,11 +316,11 @@ ulong valvesToInvert,
                 /// Reset all SendCommand() arguments
                 sendCommandFlag = false;
                 this.cmd = Command.None;
+                this.refNr = 0;
+                this.refPulses = 0;
+                this.testMethods = 0;
                 this.stopDevs = 0;
             }
-            this.refNr = 0;
-            this.refPulses = 0;
-            this.testMethods = 0;
             this.filterConstant = 0;
             this.regConst = 0;
             this.shortImp = 0;
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index f67ab8891..57b6a1596 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.5.56.1")]
-[assembly: AssemblyFileVersion("1.5.56.1")]
+[assembly: AssemblyVersion("1.5.57.1")]
+[assembly: AssemblyFileVersion("1.5.57.1")]