diff --git a/Common/Utils.cs b/Common/Utils.cs
index 96797c54e..f2f869298 100644
--- a/Common/Utils.cs
+++ b/Common/Utils.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2021-2022 Sensus Slovensko a.s.
 ///
 using System;
+using System.IO.Ports;
 
 namespace Common
 {
@@ -92,5 +93,33 @@ namespace Common
                 else return "F5";
             }
         }
+
+        public static Parity GetParity(string str, Parity defaultParity = Parity.None)
+        {
+            if (str.Equals(Parity.None.ToString())) return Parity.None;
+            if (str.Equals(Parity.Even.ToString())) return Parity.Even;
+            if (str.Equals(Parity.Odd.ToString())) return Parity.Odd;
+            if (str.Equals(Parity.Mark.ToString())) return Parity.Mark;
+            if (str.Equals(Parity.Space.ToString())) return Parity.Space;
+            return defaultParity;
+        }
+
+        public static StopBits GetStopBits(string str, StopBits defaultStopBits = StopBits.One)
+        {
+            if (str.Equals(StopBits.None.ToString())) return StopBits.None;
+            if (str.Equals(StopBits.One.ToString())) return StopBits.One;
+            if (str.Equals(StopBits.OnePointFive.ToString())) return StopBits.OnePointFive;
+            if (str.Equals(StopBits.Two.ToString())) return StopBits.Two;
+            return defaultStopBits;
+        }
+
+        public static Handshake GetHandshake(string str, Handshake defaultHandshake = Handshake.None)
+        {
+            if (str.Equals(Handshake.None.ToString())) return Handshake.None;
+            if (str.Equals(Handshake.RequestToSend.ToString())) return Handshake.RequestToSend;
+            if (str.Equals(Handshake.XOnXOff.ToString())) return Handshake.XOnXOff;
+            if (str.Equals(Handshake.RequestToSendXOnXOff.ToString())) return Handshake.RequestToSendXOnXOff;
+            return defaultHandshake;
+        }
     }
 }
diff --git a/TBF/Rig/Ambient/Comet/AmbientCfgCtrl.cs b/TBF/Rig/Ambient/Comet/AmbientCfgCtrl.cs
index 70c029d9c..6ca3129c3 100644
--- a/TBF/Rig/Ambient/Comet/AmbientCfgCtrl.cs
+++ b/TBF/Rig/Ambient/Comet/AmbientCfgCtrl.cs
@@ -88,10 +88,10 @@ namespace TBF.Rig.Ambient.Comet
 			config.Name = nameTextBox.Text;
 			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 			config.BaudRate = int.Parse(baudRateTextBox.Text);
-            config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+            config.Parity = Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
-            config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
-            config.Handshake = Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
+            config.StopBits = Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+            config.Handshake = Common.Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
             config.SetDtrToOne = setDtrCheckBox.Checked;
 
 			return flags;
diff --git a/TBF/Rig/Ambient/Greco/AmbientCfgCtrl.cs b/TBF/Rig/Ambient/Greco/AmbientCfgCtrl.cs
index ff13c0620..1fd8354d6 100644
--- a/TBF/Rig/Ambient/Greco/AmbientCfgCtrl.cs
+++ b/TBF/Rig/Ambient/Greco/AmbientCfgCtrl.cs
@@ -86,10 +86,10 @@ namespace TBF.Rig.Ambient.Greco
 			config.Name = nameTextBox.Text;
 			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 			config.BaudRate = int.Parse(baudRateTextBox.Text);
-            config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+            config.Parity = Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
-            config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
-            config.Handshake = Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
+            config.StopBits = Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+            config.Handshake = Common.Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
 
 			return flags;
 		}
diff --git a/TBF/Rig/Danfoss/VLT2800/PumpCfgCtrl.cs b/TBF/Rig/Danfoss/VLT2800/PumpCfgCtrl.cs
index 00afe824a..f1a7c4692 100644
--- a/TBF/Rig/Danfoss/VLT2800/PumpCfgCtrl.cs
+++ b/TBF/Rig/Danfoss/VLT2800/PumpCfgCtrl.cs
@@ -96,9 +96,9 @@ namespace TBF.Rig.Danfoss.VLT2800
 			config.BusAddress = int.Parse(busAddressTextBox.Text);
 			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 			config.BaudRate = int.Parse(baudRateTextBox.Text);
-            config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+            config.Parity = Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
-            config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+            config.StopBits = Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
 
 			return flags;
 		}
diff --git a/TBF/Rig/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs b/TBF/Rig/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs
index 43ac6d65b..692b8d268 100644
--- a/TBF/Rig/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs
+++ b/TBF/Rig/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs
@@ -88,10 +88,10 @@ namespace TBF.Rig.Keithley.Multimeter_2010_RS232
 			config.Name = nameTextBox.Text;
 			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 			config.BaudRate = int.Parse(baudRateTextBox.Text);
-            config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+            config.Parity = Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
-            config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
-            config.Handshake = Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
+            config.StopBits = Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+            config.Handshake = Common.Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
 
 			return flags;
 		}
diff --git a/TBF/Rig/MettlerToledo/Multi/BalanceCfgCtrl.cs b/TBF/Rig/MettlerToledo/Multi/BalanceCfgCtrl.cs
index bd3cb3bfc..19eda155c 100644
--- a/TBF/Rig/MettlerToledo/Multi/BalanceCfgCtrl.cs
+++ b/TBF/Rig/MettlerToledo/Multi/BalanceCfgCtrl.cs
@@ -200,10 +200,10 @@ namespace TBF.Rig.MettlerToledo.Multi
 			{
 				config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 				config.BaudRate = int.Parse(baudRateTextBox.Text);
-                config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+                config.Parity = Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 				config.DataBits = int.Parse(dataBitsTextBox.Text);
-                config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
-                config.Handshake = Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
+                config.StopBits = Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+                config.Handshake = Common.Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
 			}
 
 			return flags;
diff --git a/TBF/Rig/MettlerToledo/Standard/BalanceCfgCtrl.cs b/TBF/Rig/MettlerToledo/Standard/BalanceCfgCtrl.cs
index 325209aa5..e262e6315 100644
--- a/TBF/Rig/MettlerToledo/Standard/BalanceCfgCtrl.cs
+++ b/TBF/Rig/MettlerToledo/Standard/BalanceCfgCtrl.cs
@@ -214,10 +214,10 @@ namespace TBF.Rig.MettlerToledo.Standard
 
 			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 			config.BaudRate = int.Parse(baudRateTextBox.Text);
-			config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+            config.Parity = Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
-            config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
-            config.Handshake = Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
+            config.StopBits = Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+            config.Handshake = Common.Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
 
 			return flags;
 		}
diff --git a/TBF/Rig/Modbus/Common/ModbusCfgCtrl.cs b/TBF/Rig/Modbus/Common/ModbusCfgCtrl.cs
index d564f6c12..ccf680c77 100644
--- a/TBF/Rig/Modbus/Common/ModbusCfgCtrl.cs
+++ b/TBF/Rig/Modbus/Common/ModbusCfgCtrl.cs
@@ -5,7 +5,6 @@ using System;
 using System.Windows.Forms;
 using System.IO.Ports;
 using Common;
-using Config.Entities;
 using TBF.Rig.Generic;
 using TBF.Resources;
 
@@ -88,10 +87,10 @@ namespace TBF.Rig.Modbus.Common
 			config.Name = nameTextBox.Text;
 			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 			config.BaudRate = int.Parse(baudRateTextBox.Text);
-            config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+            config.Parity = global::Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
-            config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
-            config.Handshake = Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
+            config.StopBits = global::Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+            config.Handshake = global::Common.Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
 
 			return flags;
 		}
diff --git a/TBF/Rig/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs b/TBF/Rig/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs
index d8bf593f4..90a19c6d8 100644
--- a/TBF/Rig/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs
+++ b/TBF/Rig/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs
@@ -88,10 +88,10 @@ namespace TBF.Rig.RegisterReaders.KPackE.Radio
 			config.Name = nameTextBox.Text;
 			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
 			config.BaudRate = int.Parse(baudRateTextBox.Text);
-            config.Parity = Utils.GetParity(parityComboBox.SelectedItem.ToString());
+            config.Parity = Common.Utils.GetParity(parityComboBox.SelectedItem.ToString());
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
-            config.StopBits = Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
-            config.Handshake = Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
+            config.StopBits = Common.Utils.GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+            config.Handshake = Common.Utils.GetHandshake(handshakeComboBox.SelectedItem.ToString());
 
 			return flags;
 		}
diff --git a/TBF/Rig/RegisterReaders/S640Stream/S640StreamCfg.cs b/TBF/Rig/RegisterReaders/S640Stream/S640StreamCfg.cs
index e82c812fa..c5308e066 100644
--- a/TBF/Rig/RegisterReaders/S640Stream/S640StreamCfg.cs
+++ b/TBF/Rig/RegisterReaders/S640Stream/S640StreamCfg.cs
@@ -117,13 +117,13 @@ namespace TBF.Rig.RegisterReaders.S640Stream
         {
             switch (i)
             {
-                case 0: Position  = int.Parse(str);          return CfgUpdateFlags.RestartRqrd;
-                case 1: ComPortNr = int.Parse(str);          return CfgUpdateFlags.RestartRqrd;
-                case 2: BaudRate  = int.Parse(str);          return CfgUpdateFlags.RestartRqrd;
-                case 3: Parity    = Utils.GetParity(str);    return CfgUpdateFlags.RestartRqrd;
-                case 4: DataBits  = int.Parse(str);          return CfgUpdateFlags.RestartRqrd;
-                case 5: StopBits  = Utils.GetStopBits(str);  return CfgUpdateFlags.RestartRqrd;
-                case 6: Handshake = Utils.GetHandshake(str); return CfgUpdateFlags.RestartRqrd;
+                case 0: Position  = int.Parse(str);                 return CfgUpdateFlags.RestartRqrd;
+                case 1: ComPortNr = int.Parse(str);                 return CfgUpdateFlags.RestartRqrd;
+                case 2: BaudRate  = int.Parse(str);                 return CfgUpdateFlags.RestartRqrd;
+                case 3: Parity    = Common.Utils.GetParity(str);    return CfgUpdateFlags.RestartRqrd;
+                case 4: DataBits  = int.Parse(str);                 return CfgUpdateFlags.RestartRqrd;
+                case 5: StopBits  = Common.Utils.GetStopBits(str);  return CfgUpdateFlags.RestartRqrd;
+                case 6: Handshake = Common.Utils.GetHandshake(str); return CfgUpdateFlags.RestartRqrd;
                 default: return CfgUpdateFlags.None;
             }
         }
diff --git a/TBF/Rig/RegisterReaders/SerialStream/SerialStreamCfg.cs b/TBF/Rig/RegisterReaders/SerialStream/SerialStreamCfg.cs
index 700be018e..21a1a6c6f 100644
--- a/TBF/Rig/RegisterReaders/SerialStream/SerialStreamCfg.cs
+++ b/TBF/Rig/RegisterReaders/SerialStream/SerialStreamCfg.cs
@@ -121,12 +121,12 @@ namespace TBF.Rig.RegisterReaders.SerialStream
         {
             switch (i)
             {
-                case 0: ComPortNr = int.Parse(str);          return CfgUpdateFlags.RestartRqrd;
-                case 1: BaudRate  = int.Parse(str);          return CfgUpdateFlags.RestartRqrd;
-                case 2: Parity    = Utils.GetParity(str);    return CfgUpdateFlags.RestartRqrd;
-                case 3: DataBits  = int.Parse(str);          return CfgUpdateFlags.RestartRqrd;
-                case 4: StopBits  = Utils.GetStopBits(str);  return CfgUpdateFlags.RestartRqrd;
-                case 5: Handshake = Utils.GetHandshake(str); return CfgUpdateFlags.RestartRqrd;
+                case 0: ComPortNr = int.Parse(str);                 return CfgUpdateFlags.RestartRqrd;
+                case 1: BaudRate  = int.Parse(str);                 return CfgUpdateFlags.RestartRqrd;
+                case 2: Parity    = Common.Utils.GetParity(str);    return CfgUpdateFlags.RestartRqrd;
+                case 3: DataBits  = int.Parse(str);                 return CfgUpdateFlags.RestartRqrd;
+                case 4: StopBits  = Common.Utils.GetStopBits(str);  return CfgUpdateFlags.RestartRqrd;
+                case 5: Handshake = Common.Utils.GetHandshake(str); return CfgUpdateFlags.RestartRqrd;
                 default: return CfgUpdateFlags.None;
             }
         }
diff --git a/TBF/Utils.cs b/TBF/Utils.cs
index a87bbb800..bdbf0d1df 100644
--- a/TBF/Utils.cs
+++ b/TBF/Utils.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO.Ports;
 using System.Linq;
 using Config.Entities;
 using Dirichlet.Numerics;
@@ -354,32 +353,16 @@ namespace TBF
                     !fname.Contains('|');
         }
 
-        public static Parity GetParity(string str, Parity defaultParity = Parity.None)
+        /// <summary>
+        /// Returns true when component named 'method' exists and it is a hydraulical test method.
+        /// </summary>
+        /// <param name="method">Component name</param>
+        /// <returns>true = is a hydraulical test method</returns>
+        public static bool IsHydroTest(string method)
         {
-            if (str.Equals(Parity.None.ToString())) return Parity.None;
-            if (str.Equals(Parity.Even.ToString())) return Parity.Even;
-            if (str.Equals(Parity.Odd.ToString())) return Parity.Odd;
-            if (str.Equals(Parity.Mark.ToString())) return Parity.Mark;
-            if (str.Equals(Parity.Space.ToString())) return Parity.Space;
-            return defaultParity;
-        }
-
-        public static StopBits GetStopBits(string str, StopBits defaultStopBits = StopBits.One)
-        {
-            if (str.Equals(StopBits.None.ToString())) return StopBits.None;
-            if (str.Equals(StopBits.One.ToString())) return StopBits.One;
-            if (str.Equals(StopBits.OnePointFive.ToString())) return StopBits.OnePointFive;
-            if (str.Equals(StopBits.Two.ToString())) return StopBits.Two;
-            return defaultStopBits;
-        }
-
-        public static Handshake GetHandshake(string str, Handshake defaultHandshake = Handshake.None)
-        {
-            if (str.Equals(Handshake.None.ToString())) return Handshake.None;
-            if (str.Equals(Handshake.RequestToSend.ToString())) return Handshake.RequestToSend;
-            if (str.Equals(Handshake.XOnXOff.ToString())) return Handshake.XOnXOff;
-            if (str.Equals(Handshake.RequestToSendXOnXOff.ToString())) return Handshake.RequestToSendXOnXOff;
-            return defaultHandshake;
+            if (string.IsNullOrEmpty(method)) return false;
+            var tm = TBF.Rig.TbfComponents.FindComponent(method) as TBF.Rig.GenericDevices.ITestMethod;
+            return (tm != null) && tm.DoTransitions();
         }
     }
 }