diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
index 67df96ded..335d6467b 100644
--- a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
+++ b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
@@ -85,11 +85,19 @@ namespace TBF.BenchControl.Elde.FlowMeter
 				flags |= CfgUpdateFlags.Error;
 				message += Environment.NewLine + "Invalid 'Parent Name'";
 			}
+#if MALTA_WSD25
+			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 8)
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "'Idx1' should be between 0 and 8";
+			}
+#else
 			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 1 || dummy > 7)
 			{
 				flags |= CfgUpdateFlags.Error;
 				message += Environment.NewLine + "'Idx1' should be between 1 and 7";
 			}
+#endif
             float fdummy;
             if (!Utils.TryParseUFloat(nominalFlowTextBox.Text, out fdummy) || fdummy < 0.01 || fdummy > 1600)
             {
diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
index a956b9119..36deeea20 100644
--- a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
+++ b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
@@ -84,10 +84,10 @@ namespace TBF.BenchControl.Elde.PressureMeter
 				flags |= CfgUpdateFlags.Error;
 				message += Environment.NewLine + "Invalid 'Parent Name'";
 			}
-			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 7)
+			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 15)
 			{
 				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + "'Position' should be between 0 and 7";
+				message += Environment.NewLine + "'Position' should be between 0 and 15";
 			}
 			if (!int.TryParse(rs485AddressTextBox.Text, out dummy) || dummy < 0 || dummy > 255)
 			{
diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs
index 913afdae3..03b1d1e50 100644
--- a/TestBenchFramework/BenchControl/TbfComponents.cs
+++ b/TestBenchFramework/BenchControl/TbfComponents.cs
@@ -15,12 +15,10 @@ namespace TBF.BenchControl
 		{
 			Factories = new List<IComponentFactory>();
 
-			Factories.Add(new TestMethods.Adjustment.Factory());
 			Factories.Add(new ResultsPrinters.Basic.PrinterFactory());
 			Factories.Add(new BenchInfo.Munich.ComponentFactory());
 			Factories.Add(new BenchInfo.Polska.ComponentFactory());
 			Factories.Add(new Cameras.CameraRoi.CameraRoiFactory());
-			Factories.Add(new TestMethods.CombinedWithDetection.TestMethodFactory());
 			Factories.Add(new Elde.ControlBoardFactory());
 			Factories.Add(new DataEntry.Combined.EntryFormFactory());
 			Factories.Add(new DataEntry.HeatMeters12.Factory());
@@ -35,7 +33,9 @@ namespace TBF.BenchControl
 			Factories.Add(new Elde.FixedStartRegisterReader.RegisterReaderFactory());
 			Factories.Add(new Elde.FlowMeter.FlowMeterFactory());
 			Factories.Add(new Elde.FlowMeterTwins.FlowMeterFactory());
-			Factories.Add(new TestMethods.FixedStartMassCollection.Single.Factory());
+            Factories.Add(new TestMethods.Adjustment.Factory());
+            Factories.Add(new TestMethods.CombinedWithDetection.TestMethodFactory());
+            Factories.Add(new TestMethods.FixedStartMassCollection.Single.Factory());
 			Factories.Add(new TestMethods.FixedStartMassCollection.Compound.Factory());
 			Factories.Add(new TestMethods.FixedStartMassCollection.HeatMeters.Factory());
 			Factories.Add(new TestMethods.FixedStartAdvanced.Single.Factory());
@@ -45,16 +45,19 @@ namespace TBF.BenchControl
 			Factories.Add(new TestMethods.FlyingStartMassCollection.Single.Factory());
 			Factories.Add(new TestMethods.FlyingStartMassCollection.Compound.Factory());
 			Factories.Add(new TestMethods.FlyingStartMassCollection.HeatMeters.Factory());
-			Factories.Add(new DataEntry.WMStates.EntryFormFactory());
+            Factories.Add(new TestMethods.LeakTest.TestMethodFactory());
+            Factories.Add(new TestMethods.PMaxTest.TestMethodFactory());
+            Factories.Add(new TestMethods.iPerlCommunication.TestMethodFactory());              /// iPerlCommunication
+            Factories.Add(new TestMethods.CameraRoiDetection.RoiDetectionFactory());
+            Factories.Add(new TestMethods.ReferenceFlowmeterCalibration.TestMethodFactory());
+            Factories.Add(new DataEntry.WMStates.EntryFormFactory());
 			Factories.Add(new Ambient.Comet.Factory());
 			Factories.Add(new Ambient.Greco.Factory());
 			Factories.Add(new Cameras.IdcCamera.IdcCameraFactory());
 			Factories.Add(new WaterMeters.iPerl.WaterMeterFactory());							/// iPerl
-            Factories.Add(new TestMethods.iPerlCommunication.TestMethodFactory());              /// iPerlCommunication
 			Factories.Add(new Keithley.Multimeter_2010_RS232.Factory());                        /// Keithley.Multimeter_2010_RS232
             Factories.Add(new Keithley.TempMeter.Factory());                                    /// Keithley.TempMeter
             Factories.Add(new ResultsPrinters.LabelPrinter.PrinterFactory());					/// LabelPrinter
-			Factories.Add(new TestMethods.LeakTest.TestMethodFactory());
 			Factories.Add(new MettlerToledo.Standard.BalanceFactory());							/// MettlerToledo Balance
             Factories.Add(new MettlerToledo.Standard.BalanceOldFactory());						/// MettlerToledoBalanceOld
             Factories.Add(new MettlerToledo.Standard.BalanceNewFactory());						/// MettlerToledoBalanceSN
@@ -64,7 +67,6 @@ namespace TBF.BenchControl
 			Factories.Add(new Output.FileWriters.Basic.FactoryCompound());						/// Output.FileWriters.Basic.Compound
             Factories.Add(new Output.FileWriters.Enhanced.FactorySingle());						/// Output.FileWriters.Basic.Single
             Factories.Add(new Output.FileWriters.Enhanced.FactoryCompound());					/// Output.FileWriters.Basic.Compound
-            Factories.Add(new TestMethods.PMaxTest.TestMethodFactory());
 			Factories.Add(new Elde.PressureMeter.PressureMeterFactory());
 			Factories.Add(new Elde.PressureMeterInternal.PressureMeterFactory());
 			Factories.Add(new Elde.Pump.PumpFactory());
@@ -72,13 +74,11 @@ namespace TBF.BenchControl
 			Factories.Add(new Elde.PumpWithFM.PumpFactory());
             Factories.Add(new Elde.PumpTandem.PumpFactory());
 			Factories.Add(new Modbus.QuidoRS.Factory());										/// QuidoRS
-			Factories.Add(new TestMethods.ReferenceFlowmeterCalibration.TestMethodFactory());
 			Factories.Add(new Elde.RegisterReader.Factory());
 			Factories.Add(new Elde.RegulValve.RegulValveFactory());
 			Factories.Add(new Elde.RegulValveTandem.RegulValveTandemFactory());
 			Factories.Add(new ResultsPrinters.Cevak.PrinterFactory());
 			Factories.Add(new ResultsPrinters.Munich.PrinterFactory());
-			Factories.Add(new TestMethods.CameraRoiDetection.RoiDetectionFactory());
 			Factories.Add(new DB.SensusOracle.DatabaseFactory());
 			Factories.Add(new Elde.TempMeter.TempMeterFactory());
 			Factories.Add(new Elde.TempMeterInternal.TempMeterFactory());
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index ef05d2df8..8910089dc 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.10.353.1")]
-[assembly: AssemblyFileVersion("2.10.353.1")]
+[assembly: AssemblyVersion("2.10.354.1")]
+[assembly: AssemblyFileVersion("2.10.354.1")]