diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs
index 30ea0ceb2..b67661426 100644
--- a/TestBenchFramework/BenchControl/TbfComponents.cs
+++ b/TestBenchFramework/BenchControl/TbfComponents.cs
@@ -19,9 +19,11 @@ namespace TBF.BenchControl
 			Factories.Add(new TestMethods.CombinedMeters.TestMethodFactory());
 			Factories.Add(new TestMethods.CombinedWithDetection.TestMethodFactory());
 			Factories.Add(new Elde.ControlBoardFactory());
+			Factories.Add(new DataEntry.Combined.EntryFormFactory());
 			Factories.Add(new DataEntry.Munich3.EntryFormFactory());
 			Factories.Add(new DataEntry.Munich.EntryFormFactory());
-			Factories.Add(new Elde.Diverter.DiverterFactory());
+            Factories.Add(new DataEntry.Standard.EntryFormFactory());
+            Factories.Add(new Elde.Diverter.DiverterFactory());
 			Factories.Add(new TestMethods.FixedStartMassCollection.TestMethodFactory());
 			Factories.Add(new Elde.FixedStartRegisterReader.RegisterReaderFactory());
 			Factories.Add(new Elde.FlowMeter.FlowMeterFactory());
diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index 1c64bed16..c7c5ea00b 100644
--- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -307,13 +307,10 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 			/// Add data - end
 
 			/// Remove diasabled watermeters
-			for (int i = Program.WMsCount; i >= 0; i--)
-			{
-				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
-				{
-					tstRslt.Meters.RemoveAt(i);
-				}
-			}
+            //for (int i = Program.WMsCount - 1; i >= 0; i--)
+            //{
+            //    if (WaterMeters[i].Disabled) tstRslt.Meters.RemoveAt(i);
+            //}
 
 			/// Update modeless dialog error information
 			Bridge.OnAdjustmentInProgress(this, new AdjustmentInProgressEventArgs(tstRslt));
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index c1df72028..b1ee116f0 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -531,13 +531,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 			/// Add data - end
 
 			/// Remove diasabled watermeters
-			for (int i = Program.WMsCount; i >= 0; i--)
-			{
-				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
-				{
-					tstRslt.Meters.RemoveAt(i);
-				}
-			}
+            //for (int i = Program.WMsCount - 1; i >= 0; i--)
+            //{
+            //    if (WaterMeters[i].Disabled) tstRslt.Meters.RemoveAt(i);
+            //}
 
 			AddOrOverwriteResult(tstRslt);
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index b1385fa34..234e34389 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -276,13 +276,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 			/// Add data - end
 
 			/// Remove diasabled watermeters
-			for (int i = Program.WMsCount; i >= 0; i--)
-			{
-				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
-				{
-					tstRslt.Meters.RemoveAt(i);
-				}
-			}
+            //for (int i = Program.WMsCount - 1; i >= 0; i--)
+            //{
+            //    if (WaterMeters[i].Disabled) tstRslt.Meters.RemoveAt(i);
+            //}
 
 			AddOrOverwriteResult(tstRslt);
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index 0e1d45a10..f1ab07505 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -419,13 +419,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
 			/// Add data - end
 			
 			/// Remove diasabled watermeters
-			for (int i = Program.WMsCount; i >= 0; i--)
-			{
-				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
-				{
-					tstRslt.Meters.RemoveAt(i);
-				}
-			}
+            //for (int i = Program.WMsCount - 1; i >= 0; i--)
+            //{
+            //    if (WaterMeters[i].Disabled) tstRslt.Meters.RemoveAt(i);
+            //}
 
 			AddOrOverwriteResult(tstRslt);