diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
index 0a822039b..6790fa377 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
@@ -464,9 +464,9 @@ namespace TBF.BenchControl.Elde
         /// <param name="readers">An array of register readers</param>
         /// <param name="refPulses">Number of reference pulses to complete the test</param>
         /// <returns>Created operation</returns>
-        public IOperation StartMeasurementOp(IFlowMeter flowMeter, IDiverter diverter, TestMethods method, int refPulses, float filterConstant)
+        public IOperation StartMeasurementOp(OutputPath outputPath, TestMethods method, int refPulses, float filterConstant)
 		{
-            return new StartMeasurementOp(this, flowMeter, diverter, method, refPulses, filterConstant);
+			return new StartMeasurementOp(this, outputPath, method, refPulses, filterConstant);
 		}
 
         /// <summary>
diff --git a/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs b/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs
index 83b6b1b28..44a3b7c4b 100644
--- a/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs
+++ b/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs
@@ -25,21 +25,22 @@ namespace TBF.BenchControl.Elde
         /// Starts the measurement.
         /// Events:  MeasurementStarted
         /// </summary>
-        /// <param name="controlBoardDev">Control board component reference</param>
-        /// <param name="flowMeter">Flow meter component reference</param>
-        /// <param name="readers">Register readers references</param>
-        /// <param name="volume">Water volume for the test in liters</param>
-        public StartMeasurementOp(ControlBoardDev controlBoardDev, GenericDevices.IFlowMeter flowMeter,
-                                  GenericDevices.IDiverter diverter, TestMethods method, int refPulses, float filterConstant)
+        /// <param name="controlBoard">Control board component reference</param>
+		/// <param name="outputPath">Specifies used components</param>
+		/// <param name="method">Test method</param>
+		/// <param name="refPulses">Test duration in number of reference flowmeter pulses</param>
+		/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
+		public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath,
+								  TestMethods method, int refPulses, float filterConstant)
         {
-			if (controlBoardDev == null) throw new ArgumentNullException("controlBoardDev");
-			this.controlBoard = controlBoardDev;
+			if (controlBoard == null) throw new ArgumentNullException("controlBoardDev");
+			this.controlBoard = controlBoard;
 
-            if (flowMeter is Elde.FlowMeter.FlowMeter)
+            if (outputPath.FlowMeter is Elde.FlowMeter.FlowMeter)
             {
-                flowMeterIdx = (flowMeter as Elde.FlowMeter.FlowMeter).Idx1;
+				flowMeterIdx = (outputPath.FlowMeter as Elde.FlowMeter.FlowMeter).Idx1;
             }
-            else if (flowMeter is Elde.FlowMeterTwins.FlowMeter)
+			else if (outputPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
             {
                 flowMeterIdx = 0;
             }
@@ -48,9 +49,9 @@ namespace TBF.BenchControl.Elde
                 throw new ArgumentException("flowMeter is null or is not Elde");
             }
 
-            if (diverter is Elde.Diverter.Diverter)
+			if (outputPath.Diverter is Elde.Diverter.Diverter)
             {
-                diverterIdx = (diverter as Elde.Diverter.Diverter).AdcNr - 4;
+				diverterIdx = (outputPath.Diverter as Elde.Diverter.Diverter).AdcNr - 4;
             }
 
             this.refPulses = refPulses;
diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index b361df3f9..6b8674a3b 100644
--- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -176,8 +176,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 			State.Create("Adjustment : Starting the test")
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Synchro,
-                                                      totalPulses, (float)test.TolerRed))
+                .AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Synchro, totalPulses, (float)test.TolerRed))
 				.EnterState();
 			do
 			{
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
index 3c7439591..33e65cd6a 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
@@ -231,7 +231,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
 			State.Create("CombinedMeters : Starting the test")
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
+                .AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                       totalPulses, (float)test.TolerRed))
 				.EnterState();
 			do
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
index ad62ad7e7..02f4e5dfa 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
@@ -409,7 +409,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             State.Create(Strings.Start_the_test)
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
+                .AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                       totalPulses, (float)test.TolerRed))
 				.EnterState();
 			do
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs
index 091dafe57..657d51d3a 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs
@@ -285,7 +285,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters
 			State.Create("FixedStartCombinedMeters : Starting the test")
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
+                .AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                       2 * totalPulses, (float)test.TolerRed))
 				.EnterState();
 			do
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 9c1843cbf..9b4e98c38 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -285,7 +285,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 			State.Create("FixedStartMassCollection : Starting the test")
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
+                .AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                       2 * totalPulses, (float)test.TolerRed))
 				.EnterState();
 			do
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index e79a8a790..0326a40af 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -129,7 +129,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 			State.Create("FlyingStart : Starting the test")
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Synchro,
+                .AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Synchro,
                                                       totalPulses, (float)test.TolerRed))
 				.EnterState();
 			do
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index b4645df56..8d3598b67 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -243,8 +243,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
 			State.Create("FlyingStartCollectionMethod : Starting the test")
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
-                                                      totalPulses, (float)test.TolerRed))
+                .AddOperation(cBrd.StartMeasurementOp(outPath,
+													  Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
+                                                      totalPulses,
+													  (float)test.TolerRed))
 				.EnterState();
 			do
 			{
diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
index b0bb823af..b186b118b 100644
--- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
@@ -201,7 +201,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
             //------------------------------------------------
 			State.Create("ReferenceFlowmeterCalibration : Starting the test")
 				.AddOperation(checkUiOp)
-                .AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, outPath.Diverter, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
+                .AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                       totalPulses, (float)test.TolerRed))
 				.EnterState();
 			do