Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtmg
===================================================================
diff -u -r1bbff0dc763992cedf6a20ed6858e9ef0723d764 -r674ffb29bf8545b26224482a768ff4eea9b17d1a
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtmg	(.../AutomatedSystemTests.rxtmg)	(revision 1bbff0dc763992cedf6a20ed6858e9ef0723d764)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtmg	(.../AutomatedSystemTests.rxtmg)	(revision 674ffb29bf8545b26224482a768ff4eea9b17d1a)
@@ -7,135 +7,11 @@
 			id="0a837813-91bf-462e-916f-1f19b25e9ab6"
 			name="AutomatedSystemTests">
 			</modulegroups>
-			<testmodule
-			id="2c566cb1-9448-427c-8927-3fab4ab843ba"
-			name="SelectGenericItemInProjectExplorer"
-			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
-			type="Recording">
-			</testmodule>
-			<testmodule
-			id="4bdca31c-506a-458b-b676-32872be3f199"
-			name="ConvertPropertiesPanelToString"
-			ref="3732fdc4-e20c-44e8-981c-20e1d75c4fc1"
-			type="UserCode">
-			</testmodule>
-			<testmodule
-			id="c6b830c3-4e65-495c-affd-44ba5795bf07"
-			name="WaitForXMiliseconds"
-			ref="c4d13523-92e2-47e6-9f4a-8cabca3f6785"
-			type="Recording">
-			</testmodule>
-			<testmodule
-			id="cc102091-186e-4bf6-84af-f63237e19348"
-			name="ConcatenateStrings"
-			ref="b15958cf-4342-4eef-a2a3-0ec6ec4be6da"
-			type="UserCode">
-			</testmodule>
-			<modulegroupdef
-			id="cfc31f25-a6fe-4a42-ba25-2192480b1b5c"
-			name="ReadAllParametersPropertiesPanelOfItemGivenPath">
-				<groupvariables>
-					<groupvariable
-					defaultvalue="ModuleGroupDefaultValue"
-					id="12b4130c-df88-4451-bfa3-a6b91bbb10ad"
-					name="ModuleGroupfullPathToItem">
-						<modulevariable
-						moduleref="cc102091-186e-4bf6-84af-f63237e19348"
-						name="concatenatedString"
-						variableref="4296aff0-7ef3-4132-ab64-c24e27efab2e">
-						</modulevariable>
-						<modulevariable
-						moduleref="2c566cb1-9448-427c-8927-3fab4ab843ba"
-						name="pathToItemInProjectExplorer"
-						variableref="a31c9d25-98bf-4be6-a0e1-d56bcf8fe1d8">
-						</modulevariable>
-					</groupvariable>
-					<groupvariable
-					defaultvalue="ModuleGroupDefaultValue"
-					id="55414585-f0d2-4e49-bda6-0407b5ef7f75"
-					name="ModuleGrouppathToOriginalCalculation">
-						<modulevariable
-						moduleref="cc102091-186e-4bf6-84af-f63237e19348"
-						name="string1"
-						variableref="c0f6f1c8-7180-4d58-9ab9-e28819990843">
-						</modulevariable>
-					</groupvariable>
-					<groupvariable
-					defaultvalue="ModuleGroupDefaultValue"
-					id="c171ad37-a2e7-4cdc-8bd0-a78f226805de"
-					name="ModuleGroupitemPathInCalculation">
-						<modulevariable
-						moduleref="cc102091-186e-4bf6-84af-f63237e19348"
-						name="string2"
-						variableref="5bab9acc-5817-4baf-921f-3345ba8f8ec3">
-						</modulevariable>
-					</groupvariable>
-					<groupvariable
-					defaultvalue="ModuleGroupDefaultValue"
-					id="99c7818b-61ae-4862-919b-1d0cda61bbd1"
-					name="ModuleGroupdurationToExpandAllParametersInItem">
-						<modulevariable
-						moduleref="debc3fea-e999-4628-afd1-211bdc6ded32"
-						name="numberOfIterationsExpand"
-						variableref="dad1141d-7f02-4a3a-a011-eb32c0ca7b1e">
-						</modulevariable>
-					</groupvariable>
-					<groupvariable
-					id="06ce4d71-d5e8-497d-a330-390967caec86"
-					name="ModuleGroupwaitTimeUntilReadingPropertiesPanelContent">
-						<modulevariable
-						moduleref="c6b830c3-4e65-495c-affd-44ba5795bf07"
-						name="milisecondsToWait"
-						variableref="94623a49-2f71-47ad-afa6-ea0884186048">
-						</modulevariable>
-					</groupvariable>
-					<groupvariable
-					defaultvalue="ModuleGroupDefaultValue"
-					id="5e5a4e0f-2aa0-488a-8992-8d11d9b8da89"
-					name="ModuleGroupstringifiedPropertiesPanelOriginalCalculationInput">
-						<modulevariable
-						moduleref="4bdca31c-506a-458b-b676-32872be3f199"
-						name="stringifiedPropertiesPanel"
-						variableref="1a56d401-7ad8-4220-bea4-fe5914a1314c">
-						</modulevariable>
-					</groupvariable>
-				</groupvariables>
-			</modulegroupdef>
-			<testmodule
-			id="debc3fea-e999-4628-afd1-211bdc6ded32"
-			name="ExpandRowItemsInPropertiesPanel"
-			ref="de336d4d-6903-4666-935e-4619a8a89c40"
-			type="UserCode">
-			</testmodule>
 		</flatlistofchildren>
 		<childhierarchy>
 			<modulegroups
 			id="0a837813-91bf-462e-916f-1f19b25e9ab6"
 			name="AutomatedSystemTests">
-				<modulegroupdef
-				id="cfc31f25-a6fe-4a42-ba25-2192480b1b5c"
-				name="ReadAllParametersPropertiesPanelOfItemGivenPath">
-					<testmodule
-					id="cc102091-186e-4bf6-84af-f63237e19348"
-					name="ConcatenateStrings">
-					</testmodule>
-					<testmodule
-					id="2c566cb1-9448-427c-8927-3fab4ab843ba"
-					name="SelectGenericItemInProjectExplorer">
-					</testmodule>
-					<testmodule
-					id="debc3fea-e999-4628-afd1-211bdc6ded32"
-					name="ExpandRowItemsInPropertiesPanel">
-					</testmodule>
-					<testmodule
-					id="c6b830c3-4e65-495c-affd-44ba5795bf07"
-					name="WaitForXMiliseconds">
-					</testmodule>
-					<testmodule
-					id="4bdca31c-506a-458b-b676-32872be3f199"
-					name="ConvertPropertiesPanelToString">
-					</testmodule>
-				</modulegroupdef>
 			</modulegroups>
 		</childhierarchy>
 	</testsuiteentryhierarchy>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script08.rxtst
===================================================================
diff -u -ra102067765157b0ae1e9386d7029cf4081165138 -r674ffb29bf8545b26224482a768ff4eea9b17d1a
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script08.rxtst	(.../Script08.rxtst)	(revision a102067765157b0ae1e9386d7029cf4081165138)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script08.rxtst	(.../Script08.rxtst)	(revision 674ffb29bf8545b26224482a768ff4eea9b17d1a)
@@ -71,26 +71,6 @@
 				</missingdatabinding>
 			</testmodule>
 			<testmodule
-			id="035a45d0-ebd4-491c-9dd1-bcd955689ee9"
-			name="ValidateContributionOfFMInProjectExplorer"
-			ref="502bc375-64a0-4290-aa3d-5d8fa8819d35"
-			type="Recording">
-				<databinding>
-					<var
-					dataname="contribution"
-					datasourceid="b7a8dc2f-f0d7-4272-afb7-f787ef640a2f"
-					variableid="e05a5c02-06a1-4745-8d56-f32ce5980414"
-					variablename="expectedContributionPE">
-					</var>
-					<var
-					dataname="fmName"
-					datasourceid="b7a8dc2f-f0d7-4272-afb7-f787ef640a2f"
-					variableid="3a7276c1-fca1-4026-9d2e-5bac10651a47"
-					variablename="substringFMName">
-					</var>
-				</databinding>
-			</testmodule>
-			<testmodule
 			id="03b878e4-1ad5-4ea7-b1f3-d7ec1515de1e"
 			name="GetValueParameterForItemInTraject"
 			ref="3b08b464-43f7-4e4b-9c47-143e9b31807c"
@@ -714,12 +694,6 @@
 				</parameters>
 			</smartfoldernode>
 			<testmodule
-			id="472d62c1-cf6e-45e6-b814-215cfa0adc59"
-			name="CloseViewCentralPanelWithFocus"
-			ref="3c2d44f5-31b5-4584-91c8-1ad748affc77"
-			type="Recording">
-			</testmodule>
-			<testmodule
 			id="474acefb-a61d-4c72-98f9-3683e33dffa3"
 			name="ValidateParameterDoesNotExistForItemInTraject"
 			ref="76b79b85-92aa-460c-b126-3cc5de9d5f07"
@@ -1132,23 +1106,9 @@
 			name="SetN">
 			</smartfoldernode>
 			<smartfoldernode
-			id="5b137145-6eda-48d5-a9ff-43ed887b7674"
-			name="SetStateRA">
-				<parameters>
-					<param
-					name="StateToSelect"
-					value="@RA">
-					</param>
-				</parameters>
-			</smartfoldernode>
-			<smartfoldernode
 			id="5b570fe7-4ac1-497e-bd4c-b7f997e9ee8b"
 			name="ValidateNewValue">
 			</smartfoldernode>
-			<smartfoldernode
-			id="5e014e82-4d1b-4476-b7c5-87e11105ee75"
-			name="OpenViewCategoryClasses">
-			</smartfoldernode>
 			<testmodule
 			id="63483576-888f-4739-b375-5ed22953f933"
 			name="SetValueWithKeyPressParameterForItemInTraject"
@@ -1280,6 +1240,16 @@
 				</missingdatabinding>
 			</testmodule>
 			<smartfoldernode
+			id="71111e7d-4681-4c61-914f-88f0063c31de"
+			name="SelectStateTraject">
+				<parameters>
+					<param
+					name="stateWithCalculations"
+					value="@TR">
+					</param>
+				</parameters>
+			</smartfoldernode>
+			<smartfoldernode
 			datasource="tableFMsNValue"
 			errorbehavior="ContinueNextIteration"
 			id="71c7456e-a188-4d98-98c2-89d17065c55b"
@@ -1634,28 +1604,6 @@
 			name="b)LengthEffectParameters">
 			</smartfoldernode>
 			<testmodule
-			id="80ec3043-34c3-4136-96ce-17c7339f2655"
-			name="SelectState"
-			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
-			type="Recording">
-				<databinding>
-					<var
-					dataname="StateToSelect"
-					datasourceid="5b137145-6eda-48d5-a9ff-43ed887b7674"
-					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
-					variablename="stateName">
-					</var>
-				</databinding>
-				<missingdatabinding>
-					<var
-					dataname="stateName"
-					datasourceid="0c299d5c-b55a-4bbe-80f5-fd724806cc52"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatabinding>
-			</testmodule>
-			<testmodule
 			id="81a7521a-fd06-4e60-a3e5-d53488cff505"
 			name="SelectGenericItemInProjectExplorer"
 			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
@@ -1790,72 +1738,6 @@
 			name="SetBackToOriginalValue">
 			</smartfoldernode>
 			<testmodule
-			id="8aacac3e-1dfe-4f55-b1b3-a71ab292399a"
-			name="ValidateProbabilitySpaceInFailureMechanismContributionView"
-			ref="bbbbf5bf-dfd4-4308-9cd1-53e977ec87f1"
-			type="Recording">
-				<databinding>
-					<var
-					dataname="signallingValue"
-					datasourceid="4931d1c5-6f9b-42a2-85ab-b355c5f9f0e4"
-					variableid="c1f6a6e7-a412-48c1-88a7-9969552442cf"
-					variablename="signallingValueVar">
-					</var>
-					<var
-					dataname="lowLimitValue"
-					datasourceid="4931d1c5-6f9b-42a2-85ab-b355c5f9f0e4"
-					variableid="d45edc98-38df-45d4-baee-7910ebf746ec"
-					variablename="lowLimitValueVar">
-					</var>
-					<var
-					dataname="labelFM"
-					datasourceid="a935893b-4673-417b-a3b6-eedd191ca5d9"
-					variableid="7cc22a20-a5dd-4037-8ffb-9bca9a82e6ae"
-					variablename="fmLabel">
-					</var>
-					<var
-					dataname="contribution"
-					datasourceid="a935893b-4673-417b-a3b6-eedd191ca5d9"
-					variableid="89b0cb78-8dc2-46b2-a3e4-6295a3181948"
-					variablename="contributionValue">
-					</var>
-					<var
-					dataname="probabilitySpaceForZeroContribution"
-					datasourceid="955eb10b-59ab-43b5-8fe4-fd5dfac15588"
-					variableid="9b94e552-ef8b-4b1f-b14a-b179b6f3403f"
-					variablename="probSpaceForZeroContribution">
-					</var>
-					<var
-					dataname="normType"
-					datasourceid="4931d1c5-6f9b-42a2-85ab-b355c5f9f0e4"
-					variableid="062b1503-100f-4586-a386-93ef730cd7ef"
-					variablename="normTypeVar">
-					</var>
-				</databinding>
-				<missingdatabinding>
-					<var
-					dataname="normType"
-					datasourceid="d9d678b3-6afe-4095-b6b6-3ce733e4f829"
-					variableid="062b1503-100f-4586-a386-93ef730cd7ef"
-					variablename="normTypeVar">
-					</var>
-				</missingdatabinding>
-			</testmodule>
-			<testmodule
-			id="8bbaf50d-7ae4-4d7a-8d06-123c939f39dd"
-			name="SetRangeInTableForPEBasedOnTrajectType"
-			ref="3a6da0ca-5c45-4932-a886-7c30d0e62630"
-			type="Recording">
-				<databinding>
-					<var
-					dataname="trajectType"
-					datasourceid="35053357-b9f5-45fe-8657-c49a72276bbd"
-					variableid="ef7281c2-8cbd-4b30-8007-ee513bb16330"
-					variablename="trajectType">
-					</var>
-				</databinding>
-			</testmodule>
-			<testmodule
 			id="8fad36d8-cd16-490f-8f6b-433eb407eee3"
 			name="ValidateValueParameterForItemInTraject"
 			ref="54946666-7cba-49b9-b848-41ea43b074d9"
@@ -1999,21 +1881,6 @@
 					</var>
 				</missingdatabinding>
 			</testmodule>
-			<smartfoldernode
-			datasource="contributionsFMsTypeDijkFMCView"
-			id="955eb10b-59ab-43b5-8fe4-fd5dfac15588"
-			name="ValidateContributionsOfAllFMsinFMCViewTrajectTypeDijk">
-				<parameters>
-					<param
-					name="probabilitySpaceForZeroContribution"
-					value="n.v.t">
-					</param>
-				</parameters>
-			</smartfoldernode>
-			<smartfoldernode
-			id="963c282c-c528-443b-82d8-14e9d5e98bdc"
-			name="ControlFailureMechanismContributions">
-			</smartfoldernode>
 			<testmodule
 			id="9bf37e0c-947c-4f86-90cd-f6ceef6ba7bd"
 			name="GetValueParameterForItemInTraject"
@@ -2081,46 +1948,6 @@
 				</databinding>
 			</testmodule>
 			<smartfoldernode
-			datasource="contributionsFMsInProjectExplorerVisibleInPropertiesPanel"
-			id="9e2f1291-5db4-44e8-b110-68f8da0c987e"
-			name="ValidateContributionsOfAllFMsInProjectExplorer">
-				<conditiongroup
-				comparison="AND"
-				enabled="True">
-					<condition
-					comparison="IsNotEqual">
-						<leftvalue>
-							<datavaluesource>
-								<databinding
-								bindingtype="DataConnector"
-								dataname="contribution"
-								id="b7a8dc2f-f0d7-4272-afb7-f787ef640a2f">
-								</databinding>
-							</datavaluesource>
-						</leftvalue>
-						<rightvalue>
-							<simplevaluesource
-							value="0">
-							</simplevaluesource>
-						</rightvalue>
-					</condition>
-				</conditiongroup>
-			</smartfoldernode>
-			<testmodule
-			id="a103d806-76cc-48a1-a797-1bac4e909c7a"
-			name="SetRangeInTableForFMCViewBasedOnTrajectType"
-			ref="a23d7db6-2e34-49a1-8c66-009718c79641"
-			type="Recording">
-				<databinding>
-					<var
-					dataname="trajectType"
-					datasourceid="35053357-b9f5-45fe-8657-c49a72276bbd"
-					variableid="8c022444-0274-44a3-939f-061f44706b2f"
-					variablename="trajectType">
-					</var>
-				</databinding>
-			</testmodule>
-			<smartfoldernode
 			id="a232761c-ffe8-4256-854d-c47a253ea9ba"
 			name="a)Determine_Categories_Failure_Prob_per_Section">
 				<parameters>
@@ -2415,18 +2242,26 @@
 				</parameters>
 			</testcase>
 			<testmodule
-			id="b68ea2f5-2c0f-4422-9bee-5fcf4b5f1317"
-			name="SelectTrajectType"
-			ref="f3cd18f8-b687-4886-b040-fc89f784d832"
+			id="b9cfc135-0d45-450f-ae34-b91cc213f873"
+			name="SelectState"
+			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
 				<databinding>
 					<var
-					dataname="trajectType"
-					datasourceid="35053357-b9f5-45fe-8657-c49a72276bbd"
-					variableid="7e8f3140-795e-40f1-a611-9c126ff7de4f"
-					variablename="trajectType">
+					dataname="stateWithCalculations"
+					datasourceid="71111e7d-4681-4c61-914f-88f0063c31de"
+					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>
 			<testmodule
 			id="baadb165-b61c-4de8-af1f-30465183b113"
@@ -2476,7 +2311,7 @@
 			</testmodule>
 			<smartfoldernode
 			id="be32de9f-ad56-4116-a647-11fe4090a876"
-			name="ValidateBoundaries">
+			name="ValidateCategoriesBoundaries">
 				<parameters>
 					<param
 					name="numberOfPassesExpandingRows"
@@ -2489,26 +2324,6 @@
 				</parameters>
 			</smartfoldernode>
 			<testmodule
-			id="befb1777-959e-4c0a-a759-c2b5be589d03"
-			name="ValidateContributionInFailureMechanismContributionView"
-			ref="4a63a2c8-7cac-4869-96dc-543747d8c4c7"
-			type="Recording">
-				<databinding>
-					<var
-					dataname="labelFM"
-					datasourceid="a935893b-4673-417b-a3b6-eedd191ca5d9"
-					variableid="7cc22a20-a5dd-4037-8ffb-9bca9a82e6ae"
-					variablename="fmLabel">
-					</var>
-					<var
-					dataname="contribution"
-					datasourceid="a935893b-4673-417b-a3b6-eedd191ca5d9"
-					variableid="4a6b7212-c461-4d6c-895c-d6e646118872"
-					variablename="contributionValue">
-					</var>
-				</databinding>
-			</testmodule>
-			<testmodule
 			id="bfdd880f-a8d8-42b9-b2af-b7e60be27351"
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
@@ -2545,20 +2360,6 @@
 				</databinding>
 			</testmodule>
 			<testmodule
-			id="ce5d74b9-8155-414e-b80c-3960b1a6a22a"
-			name="OpenViewForFailureMechanismContribution"
-			ref="5e81345e-66bc-4e08-8ade-03d386d824fd"
-			type="Recording">
-				<missingdatabinding>
-					<var
-					dataname="substringInTrajectName"
-					datasourceid="9339f92a-867d-4e0d-b2a5-1fe03f3fc82a"
-					variableid="77ae6c27-603e-4704-add9-e1249169f0e5"
-					variablename="substringTrajectName">
-					</var>
-				</missingdatabinding>
-			</testmodule>
-			<testmodule
 			id="d17abbd7-9d75-42a8-9007-f8c5ee610999"
 			name="SetValueParameterForItemInTraject"
 			ref="fe097e7d-bf74-4910-a6c5-c4cd7da935d8"
@@ -2722,11 +2523,13 @@
 					</var>
 				</missingdatabinding>
 			</testmodule>
-			<smartfoldernode
-			id="d9d678b3-6afe-4095-b6b6-3ce733e4f829"
-			name="a)_Classes_Failure_probability_space">
-			</smartfoldernode>
 			<testmodule
+			id="dcdc9001-a1b0-4392-ac79-d7f64813cf66"
+			name="GetValueParameterInPropertiesPanelGivenPath"
+			ref="c77b1704-aea4-41db-90c0-a00bacb9cffc"
+			type="UserCode">
+			</testmodule>
+			<testmodule
 			id="de5206b0-5aed-4c3f-ae4b-e1bf40ef4e8e"
 			name="CalculateNFormula2"
 			ref="7a5a313f-03e9-4259-a9ba-83be32da5355"
@@ -2753,15 +2556,8 @@
 				</databinding>
 			</testmodule>
 			<smartfoldernode
-			datasource="possibleTrajectTypes"
-			id="decf6d51-913b-4b0a-8db7-10569a6612b6"
-			maxrange="2"
-			minrange="2"
-			name="SelectTrajectType">
-			</smartfoldernode>
-			<smartfoldernode
 			id="e0aed3bf-cb32-48bb-aa9f-ebcce37cbe0b"
-			name="ValidateBoundaries">
+			name="ValidateCategoriesBoundaries">
 				<parameters>
 					<param
 					name="numberOfPassesExpandingRows"
@@ -2840,6 +2636,13 @@
 			name="teardown">
 			</teardown>
 			<testmodule
+			id="ead7501b-3fdf-4b05-9b09-0d1943df0961"
+			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"
@@ -2962,7 +2765,7 @@
 							</smartfoldernode>
 							<smartfoldernode
 							id="e0aed3bf-cb32-48bb-aa9f-ebcce37cbe0b"
-							name="ValidateBoundaries">
+							name="ValidateCategoriesBoundaries">
 								<testmodule
 								id="27ede540-64bc-410c-8a13-e4ee063f541e"
 								name="CreateScreenshotDocumentView">
@@ -3046,7 +2849,7 @@
 							</smartfoldernode>
 							<smartfoldernode
 							id="be32de9f-ad56-4116-a647-11fe4090a876"
-							name="ValidateBoundaries">
+							name="ValidateCategoriesBoundaries">
 								<testmodule
 								id="4d0d5f9e-9af7-45f2-8147-ef7480721d7d"
 								name="CreateScreenshotDocumentView">
@@ -3070,84 +2873,36 @@
 							</smartfoldernode>
 						</smartfoldernode>
 						<smartfoldernode
-						id="d9d678b3-6afe-4095-b6b6-3ce733e4f829"
-						name="a)_Classes_Failure_probability_space">
+						id="80ae3228-cd3d-4667-9f3d-ca2618fc9db3"
+						name="b)LengthEffectParameters">
 							<smartfoldernode
-							id="5e014e82-4d1b-4476-b7c5-87e11105ee75"
-							name="OpenViewCategoryClasses">
+							id="63c12419-02aa-4ec0-a910-4ad1214f588a"
+							name="LengthEffects(trajectType=Dijk/Duin)">
 								<smartfoldernode
-								id="5b137145-6eda-48d5-a9ff-43ed887b7674"
-								name="SetStateRA">
+								id="71111e7d-4681-4c61-914f-88f0063c31de"
+								name="SelectStateTraject">
 									<testmodule
-									id="80ec3043-34c3-4136-96ce-17c7339f2655"
+									id="b9cfc135-0d45-450f-ae34-b91cc213f873"
 									name="SelectState">
 									</testmodule>
 								</smartfoldernode>
-							</smartfoldernode>
-							<smartfoldernode
-							id="963c282c-c528-443b-82d8-14e9d5e98bdc"
-							name="ControlFailureMechanismContributions">
-								<testmodule
-								id="ce5d74b9-8155-414e-b80c-3960b1a6a22a"
-								name="OpenViewForFailureMechanismContribution">
-								</testmodule>
 								<smartfoldernode
-								id="decf6d51-913b-4b0a-8db7-10569a6612b6"
-								name="SelectTrajectType">
+								id="65699a3b-a6bc-4727-bd0e-f832127575ce"
+								name="ReadTrajectLength">
 									<testmodule
-									id="b68ea2f5-2c0f-4422-9bee-5fcf4b5f1317"
-									name="SelectTrajectType">
+									id="edad3c70-d3ca-4718-9caa-17500b961766"
+									name="GetValueParameterForItemInTraject">
 									</testmodule>
 									<testmodule
-									id="a103d806-76cc-48a1-a797-1bac4e909c7a"
-									name="SetRangeInTableForFMCViewBasedOnTrajectType">
+									id="ead7501b-3fdf-4b05-9b09-0d1943df0961"
+									name="SelectGenericItemInProjectExplorer">
 									</testmodule>
-									<smartfoldernode
-									id="955eb10b-59ab-43b5-8fe4-fd5dfac15588"
-									name="ValidateContributionsOfAllFMsinFMCViewTrajectTypeDijk">
-										<testmodule
-										id="befb1777-959e-4c0a-a759-c2b5be589d03"
-										name="ValidateContributionInFailureMechanismContributionView">
-										</testmodule>
-										<testmodule
-										id="8aacac3e-1dfe-4f55-b1b3-a71ab292399a"
-										name="ValidateProbabilitySpaceInFailureMechanismContributionView">
-										</testmodule>
-									</smartfoldernode>
 									<testmodule
-									id="8bbaf50d-7ae4-4d7a-8d06-123c939f39dd"
-									name="SetRangeInTableForPEBasedOnTrajectType">
+									id="dcdc9001-a1b0-4392-ac79-d7f64813cf66"
+									name="GetValueParameterInPropertiesPanelGivenPath">
 									</testmodule>
-									<smartfoldernode
-									id="9e2f1291-5db4-44e8-b110-68f8da0c987e"
-									name="ValidateContributionsOfAllFMsInProjectExplorer">
-										<testmodule
-										id="035a45d0-ebd4-491c-9dd1-bcd955689ee9"
-										name="ValidateContributionOfFMInProjectExplorer">
-										</testmodule>
-									</smartfoldernode>
 								</smartfoldernode>
-							</smartfoldernode>
-							<testmodule
-							id="472d62c1-cf6e-45e6-b814-215cfa0adc59"
-							name="CloseViewCentralPanelWithFocus">
-							</testmodule>
-						</smartfoldernode>
-						<smartfoldernode
-						id="80ae3228-cd3d-4667-9f3d-ca2618fc9db3"
-						name="b)LengthEffectParameters">
-							<smartfoldernode
-							id="63c12419-02aa-4ec0-a910-4ad1214f588a"
-							name="LengthEffects(trajectType=Dijk/Duin)">
 								<smartfoldernode
-								id="65699a3b-a6bc-4727-bd0e-f832127575ce"
-								name="ReadTrajectLength">
-									<testmodule
-									id="edad3c70-d3ca-4718-9caa-17500b961766"
-									name="GetValueParameterForItemInTraject">
-									</testmodule>
-								</smartfoldernode>
-								<smartfoldernode
 								id="fcb08619-a998-4b9f-a9d9-3947e75b0ca3"
 								name="CompareTrajectLengthInFMs">
 									<testmodule
@@ -4698,7 +4453,7 @@
 		</DataSource>
 		<DataSource
 		id="6d42c555-b56d-4896-8200-5e6619488fd5"
-		lastknownrowcount="4"
+		lastknownrowcount="3"
 		name="tableFMsToValidateTrajectLength"
 		type="Ranorex.Core.Data.SimpleDataConnector">
 			<lastknowncolumns>
@@ -4716,24 +4471,19 @@
 				</tr>
 				<tr>
 					<td>
-						Dijken en dammen - Piping
+						Piping
 					</td>
 				</tr>
 				<tr>
 					<td>
-						Dijken en dammen - Macrostabiliteit binnenwaarts
+						Macrostabiliteit binnenwaarts
 					</td>
 				</tr>
 				<tr>
 					<td>
-						Dijken en dammen - Macrostabiliteit buitenwaarts
+						Golfklappen op asfaltbekleding
 					</td>
 				</tr>
-				<tr>
-					<td>
-						Dijken en dammen - Golfklappen op asfaltbekleding
-					</td>
-				</tr>
 			</table>
 		</DataSource>
 		<DataSource
@@ -4980,6 +4730,18 @@
 			id="4f1d6611-54b5-4e83-b1c2-c5adc3d5cd75">
 			</testcontainer>
 			<testcontainer
+			id="63c12419-02aa-4ec0-a910-4ad1214f588a">
+			</testcontainer>
+			<testcontainer
+			id="65699a3b-a6bc-4727-bd0e-f832127575ce">
+			</testcontainer>
+			<testcontainer
+			id="71111e7d-4681-4c61-914f-88f0063c31de">
+			</testcontainer>
+			<testcontainer
+			id="80ae3228-cd3d-4667-9f3d-ca2618fc9db3">
+			</testcontainer>
+			<testcontainer
 			id="86c8096d-7d7e-4ae7-b9e4-e82d534474d2">
 			</testcontainer>
 			<testcontainer
@@ -5012,6 +4774,9 @@
 			<testcontainer
 			id="e6e502fd-4733-4082-8ec1-086a639a6c1d">
 			</testcontainer>
+			<testcontainer
+			id="fcb08619-a998-4b9f-a9d9-3947e75b0ca3">
+			</testcontainer>
 		</testconfiguration>
 	</testconfigurations>
 	<references>