Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj
===================================================================
diff -u -ra102067765157b0ae1e9386d7029cf4081165138 -r5859d1e3ad9c0659dddf68e3d9f5e44d6c6d218e
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj	(.../AutomatedSystemTests.csproj)	(revision a102067765157b0ae1e9386d7029cf4081165138)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj	(.../AutomatedSystemTests.csproj)	(revision 5859d1e3ad9c0659dddf68e3d9f5e44d6c6d218e)
@@ -1896,6 +1896,9 @@
     <Compile Include="Modules\Validation\Abstract\ValidateCombinedApproxFailureProbabilityAndBeta.cs">
       <id>451d0653-a93b-4305-83ac-406b8bea1f77</id>
     </Compile>
+    <Compile Include="Modules\Validation\Abstract\ValidateEqualityStrings.cs">
+      <id>76c673a9-a642-49e6-9c0f-194fe9463b9f</id>
+    </Compile>
     <Compile Include="Modules\Validation\Abstract\ValidateSafetyFactorSTPH.cs">
       <id>ef5b2d51-65fd-4f10-9182-72da3a833f1b</id>
     </Compile>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/Abstract/ValidateEqualityStrings.cs
===================================================================
diff -u
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/Abstract/ValidateEqualityStrings.cs	(revision 0)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/Abstract/ValidateEqualityStrings.cs	(revision 5859d1e3ad9c0659dddf68e3d9f5e44d6c6d218e)
@@ -0,0 +1,82 @@
+/*
+ * Created by Ranorex
+ * User: rodriqu_dd
+ * Date: 25/03/2022
+ * Time: 13:08
+ * 
+ * To change this template use Tools > Options > Coding > Edit standard headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Drawing;
+using System.Threading;
+using WinForms = System.Windows.Forms;
+
+using Ranorex;
+using Ranorex.Core;
+using Ranorex.Core.Testing;
+
+namespace AutomatedSystemTests.Modules.Validation.Abstract
+{
+    /// <summary>
+    /// Description of ValidateEqualityStrings.
+    /// </summary>
+    [TestModule("BE733B7A-096B-4716-91C9-93590425588B", ModuleType.UserCode, 1)]
+    public class ValidateEqualityStrings : ITestModule
+    {
+        
+        string _string1 = "";
+        [TestVariable("35edb599-3a82-403c-a68d-d122782e2bd2")]
+        public string string1
+        {
+            get { return _string1; }
+            set { _string1 = value; }
+        }
+        
+        
+        string _string2 = "";
+        [TestVariable("70f1e163-3004-4b25-9a49-22f777e8aae1")]
+        public string string2
+        {
+            get { return _string2; }
+            set { _string2 = value; }
+        }
+        
+        
+        string _equalityIsExpected = "";
+        [TestVariable("e91a369c-1da2-47ba-9ad5-0524ec4a94dc")]
+        public string equalityIsExpected
+        {
+            get { return _equalityIsExpected; }
+            set { _equalityIsExpected = value; }
+        }
+        
+        /// <summary>
+        /// Constructs a new instance.
+        /// </summary>
+        public ValidateEqualityStrings()
+        {
+            // Do not delete - a parameterless constructor is required!
+        }
+
+        /// <summary>
+        /// Performs the playback of actions in this module.
+        /// </summary>
+        /// <remarks>You should not call this method directly, instead pass the module
+        /// instance to the <see cref="TestModuleRunner.Run(ITestModule)"/> method
+        /// that will in turn invoke this method.</remarks>
+        void ITestModule.Run()
+        {
+            if (equalityIsExpected=="true") {
+                Report.Info("Validating that string1ToCompare = " + string1 + " and string2ToCompare = " + string2+ " are equal.");
+                Validate.AreEqual(string1, string2);
+            } else 
+            {
+                Report.Info("Validating that string1ToCompare = " + string1 + " and string2ToCompare = " + string2+ " are unequal.");
+                Validate.IsFalse(string1==string2);
+            }
+        }
+    }
+}
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script08.rxtst
===================================================================
diff -u -r674ffb29bf8545b26224482a768ff4eea9b17d1a -r5859d1e3ad9c0659dddf68e3d9f5e44d6c6d218e
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script08.rxtst	(.../Script08.rxtst)	(revision 674ffb29bf8545b26224482a768ff4eea9b17d1a)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script08.rxtst	(.../Script08.rxtst)	(revision 5859d1e3ad9c0659dddf68e3d9f5e44d6c6d218e)
@@ -25,6 +25,12 @@
 				</missingdatabinding>
 			</testmodule>
 			<testmodule
+			id="02cd3733-484f-4f49-92bb-9dbf78252635"
+			name="SelectGenericItemInProjectExplorer"
+			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
+			type="Recording">
+			</testmodule>
+			<testmodule
 			id="02e004a9-50a8-457c-a3cf-bd67899ddfc4"
 			name="GetValueParameterForItemInTraject"
 			ref="3b08b464-43f7-4e4b-9c47-143e9b31807c"
@@ -127,6 +133,26 @@
 				</parameters>
 			</smartfoldernode>
 			<testmodule
+			id="0a0593cc-8e8d-4211-8045-7cbbcb6d5fb8"
+			name="GetValueParameterInPropertiesPanelGivenPath"
+			ref="c77b1704-aea4-41db-90c0-a00bacb9cffc"
+			type="UserCode">
+				<databinding>
+					<var
+					dataname="pathToLengthInPPforFM"
+					datasourceid="6d42c555-b56d-4896-8200-5e6619488fd5"
+					variableid="717108e0-7b86-418f-9953-a968ec4f5bef"
+					variablename="pathToElementInPropertiesPanel">
+					</var>
+					<var
+					dataname="valueLengthInFM"
+					datasourceid="fcb08619-a998-4b9f-a9d9-3947e75b0ca3"
+					variableid="b8b2d988-b9c5-4a36-b47d-a548cdc8bb5e"
+					variablename="valueOfElement">
+					</var>
+				</databinding>
+			</testmodule>
+			<testmodule
 			id="0a799e76-7742-4e4b-b388-345355e7431f"
 			name="SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue"
 			ref="52d4c162-4d43-4281-9b87-3cf96d0fa894"
@@ -239,6 +265,26 @@
 				</missingdatabinding>
 			</testmodule>
 			<testmodule
+			id="101aca6d-b39f-44c9-b437-62f29d845d13"
+			name="ValidateStringsAreEqual"
+			ref="aeaa38ed-2c8f-4c2c-9dbc-888f329cf081"
+			type="UserCode">
+				<databinding>
+					<var
+					dataname="valueLengthInFM"
+					datasourceid="fcb08619-a998-4b9f-a9d9-3947e75b0ca3"
+					variableid="51334c9e-35b0-4b8e-a31e-042eacfb5a8e"
+					variablename="string2ToCompare">
+					</var>
+					<var
+					dataname="trajectLengthValue"
+					datasourceid="63c12419-02aa-4ec0-a910-4ad1214f588a"
+					variableid="63a22286-cee4-4343-bf19-c93a2573e75b"
+					variablename="string1ToCompare">
+					</var>
+				</databinding>
+			</testmodule>
+			<testmodule
 			id="1b0346ac-f12f-44a9-b690-9f905133fbe7"
 			name="CloseViewCentralPanelWithFocus"
 			ref="3c2d44f5-31b5-4584-91c8-1ad748affc77"
@@ -374,6 +420,12 @@
 					</var>
 				</databinding>
 			</testmodule>
+			<testmodule
+			id="31f8fa48-8df5-4571-805d-fdd9f7d30d39"
+			name="GetValueParameterInPropertiesPanelGivenPath"
+			ref="c77b1704-aea4-41db-90c0-a00bacb9cffc"
+			type="UserCode">
+			</testmodule>
 			<smartfoldernode
 			id="323cdfa7-68f1-4b68-a853-77d96e689fda"
 			name="SetBackToOriginalValue">
@@ -432,6 +484,20 @@
 					</var>
 				</missingdatabinding>
 			</testmodule>
+			<testmodule
+			id="3ae447dc-8897-42ca-af99-08bbdb5f077c"
+			name="SelectGenericItemInProjectExplorer"
+			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
+			type="Recording">
+				<databinding>
+					<var
+					dataname="pathToFM"
+					datasourceid="6d42c555-b56d-4896-8200-5e6619488fd5"
+					variableid="a31c9d25-98bf-4be6-a0e1-d56bcf8fe1d8"
+					variablename="pathToItemInProjectExplorer">
+					</var>
+				</databinding>
+			</testmodule>
 			<testsuite
 			ReportTime="RelativeToTestSuiteStartTime"
 			TracingScreenshotMode="Foreground"
@@ -592,6 +658,7 @@
 				</parameters>
 			</smartfoldernode>
 			<testmodule
+			enabled="False"
 			id="409d09f1-44aa-49e8-b093-24e09f49391a"
 			name="CalculateLinearTransformationOfValue"
 			ref="ff1cb4d9-1388-49e6-bf2a-00ed354dca1e"
@@ -1101,6 +1168,28 @@
 			ref="e1edec81-14b1-41ff-bcc7-e1f75797dd7b"
 			type="Recording">
 			</testmodule>
+			<testmodule
+			id="581c8bba-28bd-4281-a8b2-2e6f69d9276c"
+			name="SelectState"
+			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
+			type="Recording">
+				<databinding>
+					<var
+					dataname="stateName"
+					datasourceid="a9a96b28-70ec-45f0-bf01-edcf5997be6d"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
+				<missingdatabinding>
+					<var
+					dataname="StateWithCalculations"
+					datasourceid="e9f97e7e-0679-44f7-91f3-fdc9ab5754bc"
+					variableid="dd230550-3763-4882-aad6-2c842903d448"
+					variablename="StateToSelect">
+					</var>
+				</missingdatabinding>
+			</testmodule>
 			<smartfoldernode
 			id="5a97e740-ae47-4f81-a055-2b61b54b490f"
 			name="SetN">
@@ -1169,6 +1258,14 @@
 					name="trajectLengthValue"
 					value="">
 					</param>
+					<param
+					name="pathToRefLineInPE"
+					value="Traject>Referentielijn">
+					</param>
+					<param
+					name="pathToLengthInPropPanel"
+					value="Algemeen>Lengte">
+					</param>
 				</parameters>
 			</smartfoldernode>
 			<smartfoldernode
@@ -1244,7 +1341,7 @@
 			name="SelectStateTraject">
 				<parameters>
 					<param
-					name="stateWithCalculations"
+					name="stateName"
 					value="@TR">
 					</param>
 				</parameters>
@@ -1274,6 +1371,13 @@
 				</parameters>
 			</smartfoldernode>
 			<testmodule
+			id="75e453f0-f8b3-4939-99d7-8ba2f843583b"
+			name="SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue"
+			ref="52d4c162-4d43-4281-9b87-3cf96d0fa894"
+			type="UserCode">
+			</testmodule>
+			<testmodule
+			enabled="False"
 			id="768cf0b8-e4e9-44b4-b79f-7d849139360d"
 			name="GetValueParameterForItemInTraject"
 			ref="3b08b464-43f7-4e4b-9c47-143e9b31807c"
@@ -1462,6 +1566,7 @@
 				</missingdatabinding>
 			</testmodule>
 			<testmodule
+			enabled="False"
 			id="7cd204d0-7a9b-47ea-aaf6-ee383b83fe6c"
 			name="SetValueParameterForItemInTraject"
 			ref="fe097e7d-bf74-4910-a6c5-c4cd7da935d8"
@@ -1604,6 +1709,12 @@
 			name="b)LengthEffectParameters">
 			</smartfoldernode>
 			<testmodule
+			id="80c65b50-c2bf-43e5-95c1-a8b5dee75436"
+			name="GetValueParameterInPropertiesPanelGivenPath"
+			ref="c77b1704-aea4-41db-90c0-a00bacb9cffc"
+			type="UserCode">
+			</testmodule>
+			<testmodule
 			id="81a7521a-fd06-4e60-a3e5-d53488cff505"
 			name="SelectGenericItemInProjectExplorer"
 			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
@@ -1652,32 +1763,6 @@
 				</databinding>
 			</testmodule>
 			<testmodule
-			id="8556c65c-3181-43b9-b0f7-ae8adb58eb88"
-			name="ValidateValueParameterForItemInTraject"
-			ref="54946666-7cba-49b9-b848-41ea43b074d9"
-			type="Recording">
-				<databinding>
-					<var
-					dataname="fmName"
-					datasourceid="6d42c555-b56d-4896-8200-5e6619488fd5"
-					variableid="cb52c14e-9bef-4f4a-9d11-1758141c50cb"
-					variablename="substringNameItemInTraject">
-					</var>
-					<var
-					dataname="trajectLengthValue"
-					datasourceid="63c12419-02aa-4ec0-a910-4ad1214f588a"
-					variableid="541e9cf7-fb71-4773-bd20-19b633ea6f9d"
-					variablename="expectedValueOfParameterForItemInTraject">
-					</var>
-					<var
-					dataname="nameOfLengthParameterToValidate"
-					datasourceid="fcb08619-a998-4b9f-a9d9-3947e75b0ca3"
-					variableid="be55172b-156d-4b6c-a990-593bf6c5d6a2"
-					variablename="nameOfParameterInPropertiesPanel">
-					</var>
-				</databinding>
-			</testmodule>
-			<testmodule
 			id="85d4aac8-4c12-465e-a5e3-14473be463f7"
 			name="ValidateValueParameterForItemInTraject"
 			ref="54946666-7cba-49b9-b848-41ea43b074d9"
@@ -2078,6 +2163,16 @@
 				</databinding>
 			</testmodule>
 			<smartfoldernode
+			id="a9a96b28-70ec-45f0-bf01-edcf5997be6d"
+			name="SelectStateRegistryAssembly">
+				<parameters>
+					<param
+					name="stateName"
+					value="@RA">
+					</param>
+				</parameters>
+			</smartfoldernode>
+			<smartfoldernode
 			datasource="tableFMsToSetAndValidateValueFor_2NA"
 			errorbehavior="ContinueNextIteration"
 			id="aa91298b-143b-487c-982b-fc84fe01889c"
@@ -2248,7 +2343,7 @@
 			type="Recording">
 				<databinding>
 					<var
-					dataname="stateWithCalculations"
+					dataname="stateName"
 					datasourceid="71111e7d-4681-4c61-914f-88f0063c31de"
 					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
 					variablename="stateName">
@@ -2415,6 +2510,12 @@
 					</param>
 				</parameters>
 			</smartfoldernode>
+			<testmodule
+			id="d620d05d-2579-42cf-beb6-d2d911255592"
+			name="ValidateStringsAreEqual"
+			ref="aeaa38ed-2c8f-4c2c-9dbc-888f329cf081"
+			type="UserCode">
+			</testmodule>
 			<smartfoldernode
 			id="d849ec75-f115-4c47-9c9e-92f5368b374f"
 			name="SignallingValue">
@@ -2478,6 +2579,7 @@
 				</missingdatabinding>
 			</testmodule>
 			<testmodule
+			enabled="False"
 			id="d9712046-10e9-4ac6-b8f6-f54a6cec16b3"
 			name="ValidateValueParameterForItemInTraject"
 			ref="54946666-7cba-49b9-b848-41ea43b074d9"
@@ -2528,6 +2630,20 @@
 			name="GetValueParameterInPropertiesPanelGivenPath"
 			ref="c77b1704-aea4-41db-90c0-a00bacb9cffc"
 			type="UserCode">
+				<databinding>
+					<var
+					dataname="pathToLengthInPropPanel"
+					datasourceid="63c12419-02aa-4ec0-a910-4ad1214f588a"
+					variableid="717108e0-7b86-418f-9953-a968ec4f5bef"
+					variablename="pathToElementInPropertiesPanel">
+					</var>
+					<var
+					dataname="trajectLengthValue"
+					datasourceid="63c12419-02aa-4ec0-a910-4ad1214f588a"
+					variableid="b8b2d988-b9c5-4a36-b47d-a548cdc8bb5e"
+					variablename="valueOfElement">
+					</var>
+				</databinding>
 			</testmodule>
 			<testmodule
 			id="de5206b0-5aed-4c3f-ae4b-e1bf40ef4e8e"
@@ -2640,31 +2756,12 @@
 			name="SelectGenericItemInProjectExplorer"
 			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
 			type="Recording">
-			</testmodule>
-			<testmodule
-			enabled="False"
-			id="edad3c70-d3ca-4718-9caa-17500b961766"
-			name="GetValueParameterForItemInTraject"
-			ref="3b08b464-43f7-4e4b-9c47-143e9b31807c"
-			type="Recording">
 				<databinding>
 					<var
-					dataname="nameItemReferenceLineInProjectExplorer"
-					datasourceid="65699a3b-a6bc-4727-bd0e-f832127575ce"
-					variableid="cb52c14e-9bef-4f4a-9d11-1758141c50cb"
-					variablename="substringnameitemintraject">
-					</var>
-					<var
-					dataname="nameLengthParameterInPropertiesPanel"
-					datasourceid="65699a3b-a6bc-4727-bd0e-f832127575ce"
-					variableid="be55172b-156d-4b6c-a990-593bf6c5d6a2"
-					variablename="nameOfParameterInPropertiesPanel">
-					</var>
-					<var
-					dataname="trajectLengthValue"
+					dataname="pathToRefLineInPE"
 					datasourceid="63c12419-02aa-4ec0-a910-4ad1214f588a"
-					variableid="d2cb0634-81a3-4751-83ba-7939e1c8f258"
-					variablename="valueOfParameterInPropertiesPanel">
+					variableid="a31c9d25-98bf-4be6-a0e1-d56bcf8fe1d8"
+					variablename="pathToItemInProjectExplorer">
 					</var>
 				</databinding>
 			</testmodule>
@@ -2703,6 +2800,10 @@
 					name="nameOfLengthParameterToValidate"
 					value="Lengte* [m]">
 					</param>
+					<param
+					name="valueLengthInFM"
+					value="">
+					</param>
 				</parameters>
 			</smartfoldernode>
 		</flatlistofchildren>
@@ -2890,10 +2991,6 @@
 								id="65699a3b-a6bc-4727-bd0e-f832127575ce"
 								name="ReadTrajectLength">
 									<testmodule
-									id="edad3c70-d3ca-4718-9caa-17500b961766"
-									name="GetValueParameterForItemInTraject">
-									</testmodule>
-									<testmodule
 									id="ead7501b-3fdf-4b05-9b09-0d1943df0961"
 									name="SelectGenericItemInProjectExplorer">
 									</testmodule>
@@ -2903,18 +3000,54 @@
 									</testmodule>
 								</smartfoldernode>
 								<smartfoldernode
+								id="a9a96b28-70ec-45f0-bf01-edcf5997be6d"
+								name="SelectStateRegistryAssembly">
+									<testmodule
+									id="581c8bba-28bd-4281-a8b2-2e6f69d9276c"
+									name="SelectState">
+									</testmodule>
+								</smartfoldernode>
+								<smartfoldernode
 								id="fcb08619-a998-4b9f-a9d9-3947e75b0ca3"
 								name="CompareTrajectLengthInFMs">
 									<testmodule
-									id="8556c65c-3181-43b9-b0f7-ae8adb58eb88"
-									name="ValidateValueParameterForItemInTraject">
+									id="3ae447dc-8897-42ca-af99-08bbdb5f077c"
+									name="SelectGenericItemInProjectExplorer">
 									</testmodule>
+									<testmodule
+									id="0a0593cc-8e8d-4211-8045-7cbbcb6d5fb8"
+									name="GetValueParameterInPropertiesPanelGivenPath">
+									</testmodule>
+									<testmodule
+									id="101aca6d-b39f-44c9-b437-62f29d845d13"
+									name="ValidateStringsAreEqual">
+									</testmodule>
 								</smartfoldernode>
 							</smartfoldernode>
 							<smartfoldernode
 							id="3ea72a48-9cc6-4b39-8ecf-4f93b6c09a2f"
 							name="SetNewValueForParameter_a">
 								<testmodule
+								id="02cd3733-484f-4f49-92bb-9dbf78252635"
+								name="SelectGenericItemInProjectExplorer">
+								</testmodule>
+								<testmodule
+								id="80c65b50-c2bf-43e5-95c1-a8b5dee75436"
+								name="GetValueParameterInPropertiesPanelGivenPath">
+								</testmodule>
+								<testmodule
+								id="75e453f0-f8b3-4939-99d7-8ba2f843583b"
+								name="SetValueParameterInPropertiesPanelGivenPathTypeAndNewValue">
+								</testmodule>
+								<testmodule
+								id="31f8fa48-8df5-4571-805d-fdd9f7d30d39"
+								name="GetValueParameterInPropertiesPanelGivenPath">
+								</testmodule>
+								<testmodule
+								id="d620d05d-2579-42cf-beb6-d2d911255592"
+								name="ValidateStringsAreEqual">
+								</testmodule>
+								<testmodule
 								id="768cf0b8-e4e9-44b4-b79f-7d849139360d"
 								name="GetValueParameterForItemInTraject">
 								</testmodule>
@@ -4458,31 +4591,46 @@
 		type="Ranorex.Core.Data.SimpleDataConnector">
 			<lastknowncolumns>
 				<column>
-					fmName
+					pathToFM
 				</column>
+				<column>
+					pathToLengthInPPforFM
+				</column>
 			</lastknowncolumns>
 			<maskedcolumns>
 			</maskedcolumns>
 			<table>
 				<tr>
 					<th>
-						fmName
+						pathToFM
 					</th>
+					<th>
+						pathToLengthInPPforFM
+					</th>
 				</tr>
 				<tr>
 					<td>
-						Piping
+						Traject&gt;@GF&gt;@STPH
 					</td>
+					<td>
+						Lengte-effect&gt;Lengte
+					</td>
 				</tr>
 				<tr>
 					<td>
-						Macrostabiliteit binnenwaarts
+						Traject&gt;@GF&gt;@STBI
 					</td>
+					<td>
+						Lengte-effect&gt;Lengte
+					</td>
 				</tr>
 				<tr>
 					<td>
-						Golfklappen op asfaltbekleding
+						Traject&gt;@GF&gt;@AGK
 					</td>
+					<td>
+						Lengte-effect&gt;Lengte
+					</td>
 				</tr>
 			</table>
 		</DataSource>
@@ -4751,6 +4899,9 @@
 			id="a42ea627-0e94-475a-ab47-26af7e16caeb">
 			</testcontainer>
 			<testcontainer
+			id="a9a96b28-70ec-45f0-bf01-edcf5997be6d">
+			</testcontainer>
+			<testcontainer
 			id="b2335e82-7645-4923-9b34-eaf64089e1e8">
 			</testcontainer>
 			<testcontainer
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst
===================================================================
diff -u -r8a6fc9305c59af074879bea4e9156622a7a4ab83 -r5859d1e3ad9c0659dddf68e3d9f5e44d6c6d218e
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst	(.../Script15.rxtst)	(revision 8a6fc9305c59af074879bea4e9156622a7a4ab83)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst	(.../Script15.rxtst)	(revision 5859d1e3ad9c0659dddf68e3d9f5e44d6c6d218e)
@@ -4751,12 +4751,6 @@
 					</var>
 				</missingdatabinding>
 			</testmodule>
-			<smartfoldernode
-			datasource="script15d_HydraulicBCCalculationsToCarryOut"
-			errorbehavior="ContinueNextIteration"
-			id="eb0bc417-7050-4ce7-abc9-d0dcfcd6efb1"
-			name="LoopHydraulicBoundaryCalculationsAfterChangeClimateScenario">
-			</smartfoldernode>
 			<testmodule
 			id="ec30564b-16d1-4927-a1ca-ef52351ada8f"
 			name="ClickOnRunSelectedHBCCalculations"
@@ -6000,69 +5994,65 @@
 								id="d946d7ec-7467-4842-a487-1a67cfeb1fd0"
 								name="CalculateHBC">
 									<smartfoldernode
-									id="eb0bc417-7050-4ce7-abc9-d0dcfcd6efb1"
-									name="LoopHydraulicBoundaryCalculationsAfterChangeClimateScenario">
-										<smartfoldernode
-										id="46d281ab-a2a3-4602-8787-792a9fb83272"
-										name="OpenDocumentViewForHydraulicBCItem">
-											<testmodule
-											id="920a1d73-0967-442a-bba5-fbc5a5d68cbf"
-											name="GetStepFromPath">
-											</testmodule>
-											<testmodule
-											id="5e513b9b-2f84-485d-ac45-2366d977b5b5"
-											name="ConvertProbabilityToCurrentCulture">
-											</testmodule>
-											<testmodule
-											id="72a38dd0-35eb-4c03-9a18-849bc6b4a024"
-											name="ReplaceSubstring">
-											</testmodule>
-											<testmodule
-											id="0828bfaf-af05-441b-88c4-64202b1f5fc7"
-											name="SelectGenericItemInProjectExplorer">
-											</testmodule>
-											<testmodule
-											id="fbd90976-9759-4334-811f-70f341b69196"
-											name="OpenViewForCurrentlySelectedItemInProjectExplorer">
-											</testmodule>
-										</smartfoldernode>
-										<smartfoldernode
-										id="57c0813e-ccc9-428a-8ff2-2e57d32bbe74"
-										name="ValidateResultInDocumentViewHasBeenDeleted">
-											<testmodule
-											id="48008046-e20d-474e-8d19-a70106e009df"
-											name="ValidateWaterLevelWaveHeightInDocumentView">
-											</testmodule>
-										</smartfoldernode>
-										<smartfoldernode
-										id="5ffbd4bf-934f-4121-922c-6dcebc873aa6"
-										name="SelectLocationForCalculation">
-											<testmodule
-											id="e2bb7be5-6c51-4f26-b385-95a2030b7923"
-											name="SelectCalculationsAndIllustrationPoints">
-											</testmodule>
-										</smartfoldernode>
-										<smartfoldernode
-										id="f6703f8b-81e1-47cc-8b29-6b8f4dbc2d18"
-										name="RunHydraulicBCCalculationUntilFinished">
-											<testmodule
-											id="fc883d05-25b5-47a1-aab5-847d63e4c73c"
-											name="ClickOnRunSelectedHBCCalculations">
-											</testmodule>
-											<testmodule
-											id="0feab7f1-fba0-4d7d-a00a-399505b7b1cd"
-											name="WaitUntilAllCalculationsHaveBeenCarriedOut">
-											</testmodule>
-										</smartfoldernode>
-										<smartfoldernode
-										id="281cc25b-9665-40d2-b9b8-beff08d662fc"
-										name="CloseDocumentView">
-											<testmodule
-											id="48898fb1-2673-475e-8910-956412a4c5c6"
-											name="CloseViewCentralPanelWithFocus">
-											</testmodule>
-										</smartfoldernode>
+									id="46d281ab-a2a3-4602-8787-792a9fb83272"
+									name="OpenDocumentViewForHydraulicBCItem">
+										<testmodule
+										id="920a1d73-0967-442a-bba5-fbc5a5d68cbf"
+										name="GetStepFromPath">
+										</testmodule>
+										<testmodule
+										id="5e513b9b-2f84-485d-ac45-2366d977b5b5"
+										name="ConvertProbabilityToCurrentCulture">
+										</testmodule>
+										<testmodule
+										id="72a38dd0-35eb-4c03-9a18-849bc6b4a024"
+										name="ReplaceSubstring">
+										</testmodule>
+										<testmodule
+										id="0828bfaf-af05-441b-88c4-64202b1f5fc7"
+										name="SelectGenericItemInProjectExplorer">
+										</testmodule>
+										<testmodule
+										id="fbd90976-9759-4334-811f-70f341b69196"
+										name="OpenViewForCurrentlySelectedItemInProjectExplorer">
+										</testmodule>
 									</smartfoldernode>
+									<smartfoldernode
+									id="57c0813e-ccc9-428a-8ff2-2e57d32bbe74"
+									name="ValidateResultInDocumentViewHasBeenDeleted">
+										<testmodule
+										id="48008046-e20d-474e-8d19-a70106e009df"
+										name="ValidateWaterLevelWaveHeightInDocumentView">
+										</testmodule>
+									</smartfoldernode>
+									<smartfoldernode
+									id="5ffbd4bf-934f-4121-922c-6dcebc873aa6"
+									name="SelectLocationForCalculation">
+										<testmodule
+										id="e2bb7be5-6c51-4f26-b385-95a2030b7923"
+										name="SelectCalculationsAndIllustrationPoints">
+										</testmodule>
+									</smartfoldernode>
+									<smartfoldernode
+									id="f6703f8b-81e1-47cc-8b29-6b8f4dbc2d18"
+									name="RunHydraulicBCCalculationUntilFinished">
+										<testmodule
+										id="fc883d05-25b5-47a1-aab5-847d63e4c73c"
+										name="ClickOnRunSelectedHBCCalculations">
+										</testmodule>
+										<testmodule
+										id="0feab7f1-fba0-4d7d-a00a-399505b7b1cd"
+										name="WaitUntilAllCalculationsHaveBeenCarriedOut">
+										</testmodule>
+									</smartfoldernode>
+									<smartfoldernode
+									id="281cc25b-9665-40d2-b9b8-beff08d662fc"
+									name="CloseDocumentView">
+										<testmodule
+										id="48898fb1-2673-475e-8910-956412a4c5c6"
+										name="CloseViewCentralPanelWithFocus">
+										</testmodule>
+									</smartfoldernode>
 								</smartfoldernode>
 								<smartfoldernode
 								id="c7ecb4e3-186b-42cf-89c7-7840e90561cf"
@@ -7361,39 +7351,6 @@
 			</table>
 		</DataSource>
 		<DataSource
-		id="f15d38ce-c989-46a1-b670-6491a0acaf99"
-		lastknownrowcount="1"
-		name="script15d_HydraulicBCCalculationsToCarryOut"
-		type="Ranorex.Core.Data.SimpleDataConnector">
-			<lastknowncolumns>
-				<column>
-					pathFromTrajectToHydraulicBCCalculationItem
-				</column>
-				<column>
-					fmLabel
-				</column>
-			</lastknowncolumns>
-			<maskedcolumns>
-			</maskedcolumns>
-			<table>
-				<tr>
-					<th>
-						pathFromTrajectToHydraulicBCCalculationItem
-					</th>
-					<th>
-						fmLabel
-					</th>
-				</tr>
-				<tr>
-					<td>
-						Traject&gt;@HB&gt;Waterstanden&gt;1/3000
-					</td>
-					<td>
-					</td>
-				</tr>
-			</table>
-		</DataSource>
-		<DataSource
 		id="4a60ee36-4886-48f5-a7ed-2c77fde452a0"
 		lastknownrowcount="1"
 		name="script15d_LocationsToCalculateWaterLevels"
@@ -7825,9 +7782,6 @@
 			id="e3bfbfc0-3e28-4673-a704-6693ceefa9ec">
 			</testcontainer>
 			<testcontainer
-			id="eb0bc417-7050-4ce7-abc9-d0dcfcd6efb1">
-			</testcontainer>
-			<testcontainer
 			id="f439c70d-b78e-4927-af51-08e1f2ab0e05">
 			</testcontainer>
 			<testcontainer