Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterInPropertiesPanelGivenPath.cs
===================================================================
diff -u -r811b4eb3c65fc8c315cb7e8a9fbb49a5c3d0b2c5 -rf8a0eced0108e7ef0a226cc7fc2128828cffba15
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterInPropertiesPanelGivenPath.cs	(.../GetValueParameterInPropertiesPanelGivenPath.cs)	(revision 811b4eb3c65fc8c315cb7e8a9fbb49a5c3d0b2c5)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterInPropertiesPanelGivenPath.cs	(.../GetValueParameterInPropertiesPanelGivenPath.cs)	(revision f8a0eced0108e7ef0a226cc7fc2128828cffba15)
@@ -66,7 +66,7 @@
             AutomatedSystemTestsRepository myRepository = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance;
             Adapter propertiesPanelAdapter = myRepository.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.Self;
 
-            Ranorex.Row row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToElementInPropertiesPanel, propertiesPanelAdapter);
+            var row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToElementInPropertiesPanel, propertiesPanelAdapter);
             valueOfElement = row.Element.GetAttributeValueText("AccessibleValue");
         }
     }
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue.cs
===================================================================
diff -u -r811b4eb3c65fc8c315cb7e8a9fbb49a5c3d0b2c5 -rf8a0eced0108e7ef0a226cc7fc2128828cffba15
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue.cs	(.../SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue.cs)	(revision 811b4eb3c65fc8c315cb7e8a9fbb49a5c3d0b2c5)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue.cs	(.../SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue.cs)	(revision f8a0eced0108e7ef0a226cc7fc2128828cffba15)
@@ -76,7 +76,7 @@
             AutomatedSystemTestsRepository myRepository = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance;
             Adapter propertiesPanelAdapter = myRepository.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.Self;
 
-            Ranorex.Row row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToElementInPropertiesPanel, propertiesPanelAdapter);
+            var row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToElementInPropertiesPanel, propertiesPanelAdapter);
             row.SetValue(newValueForParameter, typeParameter);
         }
     }
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateDoubleValueparameterInPropertiesPanelGivenPath.UserCode.cs
===================================================================
diff -u -r345c025ca78c7daa105cd8583632b9bdcab59348 -rf8a0eced0108e7ef0a226cc7fc2128828cffba15
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateDoubleValueparameterInPropertiesPanelGivenPath.UserCode.cs	(.../ValidateDoubleValueparameterInPropertiesPanelGivenPath.UserCode.cs)	(revision 345c025ca78c7daa105cd8583632b9bdcab59348)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateDoubleValueparameterInPropertiesPanelGivenPath.UserCode.cs	(.../ValidateDoubleValueparameterInPropertiesPanelGivenPath.UserCode.cs)	(revision f8a0eced0108e7ef0a226cc7fc2128828cffba15)
@@ -42,7 +42,7 @@
             fixedDataSourceCulture.NumberFormat.NumberGroupSeparator = "";
             System.Globalization.CultureInfo currentCulture = CultureInfo.CurrentCulture;
 
-            Ranorex.Row row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToRowInPropertiesPanel, propertiesPanelAdapter);
+            var row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToRowInPropertiesPanel, propertiesPanelAdapter);
             string currentValueString = row.Element.GetAttributeValueText("AccessibleValue");
             double currentValueDouble = Double.Parse(currentValueString, currentCulture);
             double expectedValueDouble = Double.Parse(expectedValueString, fixedDataSourceCulture);
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateTextValueInPropertiesPanelGivenPath.cs
===================================================================
diff -u -r345c025ca78c7daa105cd8583632b9bdcab59348 -rf8a0eced0108e7ef0a226cc7fc2128828cffba15
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateTextValueInPropertiesPanelGivenPath.cs	(.../ValidateTextValueInPropertiesPanelGivenPath.cs)	(revision 345c025ca78c7daa105cd8583632b9bdcab59348)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateTextValueInPropertiesPanelGivenPath.cs	(.../ValidateTextValueInPropertiesPanelGivenPath.cs)	(revision f8a0eced0108e7ef0a226cc7fc2128828cffba15)
@@ -65,7 +65,7 @@
         {
             var repo = AutomatedSystemTests.AutomatedSystemTestsRepository.Instance;
             var table = repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.SelfInfo.CreateAdapter<Table>(true);
-            Ranorex.Row row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToRowInPP, table);
+            var row = PropertiesPanelHelpers.GetRowInPropertiesPanelGivenPath(pathToRowInPP, table);
             string currentValue = row.Element.GetAttributeValueText("AccessibleValue");
             Validate.AreEqual(currentValue, expectedText);
         }
Index: System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/PropertiesPanelHelpers.cs
===================================================================
diff -u -rb98b515a9c3cb7cfbeb827ab26eecaa487cae423 -rf8a0eced0108e7ef0a226cc7fc2128828cffba15
--- System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/PropertiesPanelHelpers.cs	(.../PropertiesPanelHelpers.cs)	(revision b98b515a9c3cb7cfbeb827ab26eecaa487cae423)
+++ System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/PropertiesPanelHelpers.cs	(.../PropertiesPanelHelpers.cs)	(revision f8a0eced0108e7ef0a226cc7fc2128828cffba15)
@@ -35,30 +35,35 @@
         /// This static method returns a Row object given the path in the properties panel.
         /// </summary>
         [UserCodeMethod]
-        public static Ranorex.Row GetRowInPropertiesPanelGivenPath(string pathItem, Adapter argumentAdapter)
+        public static Ranorex.Adapter GetRowInPropertiesPanelGivenPath(string pathItem, Adapter argumentAdapter)
         {
             Mouse.DefaultMoveTime = 0;
             Keyboard.DefaultKeyPressTime = 0;
             Delay.SpeedFactor = 0.0;
             int minimumIndex = 0;
             var stepsPathItem = pathItem.Split('>').ToList();
-            Ranorex.Row stepRow = argumentAdapter.As<Table>().Rows.ToList()[1];
+            var stepRow = argumentAdapter.As<Table>().Children.ToList()[1];
             for (int i=0; i < stepsPathItem.Count; i++)
             {
                 // Find the item corresponding to the step
                 var step = stepsPathItem[i];
-                var completeList = argumentAdapter.As<Table>().Rows.ToList();
+                var completeList = argumentAdapter.As<Table>().Children.ToList();
                 var searchList = completeList.GetRange(minimumIndex, completeList.Count-minimumIndex);
-                var kk = searchList.Where(rw => rw.GetAttributeValue<string>("AccessibleName").Contains(step));
-                var kk2 = searchList.Select(rw => rw.GetAttributeValue<string>("AccessibleName"));
-                var indexStepRow = searchList.FindIndex(rw => rw.GetAttributeValue<string>("AccessibleName").Contains(step));
+                var indexStepRow = searchList.FindIndex(row => row.GetAttributeValue<string>("AccessibleName").Contains(step));
                 stepRow = searchList[indexStepRow];
                 stepRow.Focus();
-                stepRow.Select();
+                
+                var cell = stepRow.As<Cell>();
+                if (cell != null)
+                {
+                    cell.Select();
+                }
+                
                 if (i != stepsPathItem.Count - 1 && stepRow.Element.GetAttributeValueText("AccessibleState").Contains("Collapsed"))
                 {
                     stepRow.PressKeys("{Right}");
                 }
+                
                 minimumIndex += 1 + indexStepRow;
             }
             return stepRow;
@@ -69,7 +74,7 @@
         /// This method sets a new value to a parameter in a field in properties panel given its path.
         /// </summary>
         [UserCodeMethod]
-        public static void SetValue(this Ranorex.Row row, string newValue, string parameterType)
+        public static void SetValue(this Ranorex.Adapter row, string newValue, string parameterType)
         {
             switch (parameterType) {
                 case "Text":
@@ -88,17 +93,17 @@
             }
         }
         
-        private static void SetDoubleParameterInPropertiesPanel(Ranorex.Row row, string newValue)
+        private static void SetDoubleParameterInPropertiesPanel(Ranorex.Adapter row, string newValue)
         {
             row.Element.SetAttributeValue("AccessibleValue", newValue.ToCurrentCulture());
         }
         
-        private static void SetTextParameterInPropertiesPanel(Ranorex.Row row, string newValue)
+        private static void SetTextParameterInPropertiesPanel(Ranorex.Adapter row, string newValue)
         {
             row.Element.SetAttributeValue("AccessibleValue", newValue);
         }
         
-        private static void SetDynamicDropDownParameterInPropertiesPanel(Ranorex.Row row, string newValueForParameter, RepoItemInfo listItemInfo)
+        private static void SetDynamicDropDownParameterInPropertiesPanel(Ranorex.Adapter row, string newValueForParameter, RepoItemInfo listItemInfo)
         {
             row.Click();
             row.Click(".98;.5");