Index: System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst
===================================================================
diff -u -r8a77ecf2c835501ad7ea5830df5b51ca0127742e -r767f26b5ef6cee42d62a4249e906b143c74599d6
--- System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst	(.../NormalSystemTests.rxtst)	(revision 8a77ecf2c835501ad7ea5830df5b51ca0127742e)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst	(.../NormalSystemTests.rxtst)	(revision 767f26b5ef6cee42d62a4249e906b143c74599d6)
@@ -1708,6 +1708,26 @@
 			type="Recording">
 			</testmodule>
 			<testmodule
+			id="161c1851-3323-40e9-8558-cac7ea45acb0"
+			name="SaveAs"
+			ref="9195acd9-b037-4ace-80c3-0f7f64c35452"
+			type="Recording">
+				<databinding>
+					<var
+					dataname="scriptOutputFolder"
+					datasourceid="e2972406-d6f7-4ba7-8de2-9e928bd5e038"
+					variableid="75a65d50-6a8f-4582-9f63-7c20d0f1ae9f"
+					variablename="scriptOutputPath">
+					</var>
+					<var
+					dataname="fileNameToSave"
+					datasourceid="a7928d13-07cb-4c7a-bb5b-de827256d860"
+					variableid="d40271fe-a08b-44b0-bb48-a991f40e104b"
+					variablename="fileName">
+					</var>
+				</databinding>
+			</testmodule>
+			<testmodule
 			id="168ba32a-a3d3-4db9-a236-1e97b45e0b35"
 			name="SelectGenericItemInProjectExplorer"
 			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
@@ -12943,7 +12963,7 @@
 				<parameters>
 					<param
 					name="fielNameToOpen"
-					value="X:\script18\Project_18.risk">
+					value="X:\script18\input\Project_17b.risk">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -13682,6 +13702,16 @@
 			id="a771e1b0-2c96-4cb7-a098-e3c2cfd4d0c7"
 			name="PrepareFiles3sections">
 			</smartfoldernode>
+			<smartfoldernode
+			id="a7928d13-07cb-4c7a-bb5b-de827256d860"
+			name="SaveProject">
+				<parameters>
+					<param
+					name="fileNameToSave"
+					value="script18.risk">
+					</param>
+				</parameters>
+			</smartfoldernode>
 			<testmodule
 			id="a7b21ed5-8b7b-4614-9582-9bb43bc8b2ed"
 			name="SelectGenericItemInProjectExplorer"
@@ -24864,6 +24894,14 @@
 								</testmodule>
 							</smartfoldernode>
 						</smartfoldernode>
+						<smartfoldernode
+						id="a7928d13-07cb-4c7a-bb5b-de827256d860"
+						name="SaveProject">
+							<testmodule
+							id="161c1851-3323-40e9-8558-cac7ea45acb0"
+							name="SaveAs">
+							</testmodule>
+						</smartfoldernode>
 						<teardown
 						id="710136e9-de8e-48b2-b63c-c91e105501bc"
 						name="teardown">
@@ -44427,6 +44465,9 @@
 			id="a771e1b0-2c96-4cb7-a098-e3c2cfd4d0c7">
 			</testcontainer>
 			<testcontainer
+			id="a7928d13-07cb-4c7a-bb5b-de827256d860">
+			</testcontainer>
+			<testcontainer
 			id="a819a079-65da-438e-9cc3-6d3e009ed1bb">
 			</testcontainer>
 			<testcontainer
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressDavid.rxtst
===================================================================
diff -u -r9f7466073e464baf054bbf7ba4d26ff6c1202a2c -r767f26b5ef6cee42d62a4249e906b143c74599d6
--- System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressDavid.rxtst	(.../WorkInProgressDavid.rxtst)	(revision 9f7466073e464baf054bbf7ba4d26ff6c1202a2c)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressDavid.rxtst	(.../WorkInProgressDavid.rxtst)	(revision 767f26b5ef6cee42d62a4249e906b143c74599d6)
@@ -123,6 +123,14 @@
 			name="WaitForXMiliseconds"
 			ref="c4d13523-92e2-47e6-9f4a-8cabca3f6785"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="timeToWaitBeforeCancelling"
+					datasourceid="ce3192fb-4dd8-4cb3-bf0b-4a6200047426"
+					variableid="94623a49-2f71-47ad-afa6-ea0884186048"
+					variablename="milisecondsToWait">
+					</var>
+				</databinding>
 			</testmodule>
 			<smartfoldernode
 			id="0b75293d-3ab1-4bf6-aa8d-d9cdd6e4af52"
@@ -1211,12 +1219,12 @@
 			ref="b15958cf-4342-4eef-a2a3-0ec6ec4be6da"
 			type="UserCode">
 				<description>
-					<![CDATA[path subfolder + >]]>
+					<![CDATA[path subfolder + relative path to result item]]>
 				</description>
 				<databinding>
 					<var
-					dataname="charPathSeparator"
-					datasourceid="9ba0097d-cdfa-47ce-8c3e-cce3097adeea"
+					dataname="relativePathToRasultItemInPE"
+					datasourceid="41df6bc7-84e7-4799-8eee-2febffe9a5ea"
 					variableid="5bab9acc-5817-4baf-921f-3345ba8f8ec3"
 					variablename="string2">
 					</var>
@@ -1226,6 +1234,12 @@
 					variableid="4296aff0-7ef3-4132-ab64-c24e27efab2e"
 					variablename="concatenatedString">
 					</var>
+					<var
+					dataname="pathToCalculationsInPE"
+					datasourceid="ce3192fb-4dd8-4cb3-bf0b-4a6200047426"
+					variableid="c0f6f1c8-7180-4d58-9ab9-e28819990843"
+					variablename="string1">
+					</var>
 				</databinding>
 				<missingdatabinding>
 					<var
@@ -1279,29 +1293,6 @@
 			name="StartCalculations">
 			</smartfoldernode>
 			<testmodule
-			id="6f638719-100e-4959-a285-f13e148a2ae7"
-			name="AppendString"
-			ref="ed043061-2b4f-4f84-b57b-5a205f5d26f9"
-			type="UserCode">
-				<description>
-					<![CDATA[+ Resultaat]]>
-				</description>
-				<databinding>
-					<var
-					dataname="pathToResultsInCalculation"
-					datasourceid="9ba0097d-cdfa-47ce-8c3e-cce3097adeea"
-					variableid="26242e38-327b-4a74-a725-5f16b6024635"
-					variablename="mainString">
-					</var>
-					<var
-					dataname="suffixResults"
-					datasourceid="9ba0097d-cdfa-47ce-8c3e-cce3097adeea"
-					variableid="ac8b4a2f-fc21-444f-b33b-6207615639e2"
-					variablename="stringToAppendToMainString">
-					</var>
-				</databinding>
-			</testmodule>
-			<testmodule
 			id="71cc000f-ab68-4ca9-bac9-e594e30528a7"
 			name="ReplaceSubstring"
 			ref="92030a75-8205-438c-9c04-f777a02a0b87"
@@ -2035,10 +2026,10 @@
 				</databinding>
 			</testmodule>
 			<smartfoldernode
-			datasource="script19_LoopConfigureCalculations_a"
+			datasource="script20a_LoopValidateNoResults"
 			errorbehavior="ContinueNextIteration"
 			id="9ba0097d-cdfa-47ce-8c3e-cce3097adeea"
-			name="ValidateNoResults">
+			name="ValidateNoResultsAfterCanceling">
 				<parameters>
 					<param
 					name="suffixResults"
@@ -2333,8 +2324,11 @@
 				</parameters>
 			</smartfoldernode>
 			<smartfoldernode
+			datarangeactive="True"
 			datasource="script20a_LoopFMsStartAndCancelCalculations"
 			id="b56b1441-e7cf-4f34-902a-2b663737e035"
+			maxrange="5"
+			minrange="1"
 			name="LoopFMs">
 			</smartfoldernode>
 			<testsuite
@@ -2661,6 +2655,20 @@
 				</parameters>
 			</testcase>
 			<testmodule
+			id="d59c759d-213d-4f26-813a-0ba1a30f02b2"
+			name="LogWarningMessage"
+			ref="ac560c61-46db-435c-aa8c-6cd15f93e120"
+			type="Recording">
+				<databinding>
+					<var
+					dataname="importantNote"
+					datasourceid="dccc7f9c-f810-41a2-ac32-047f0ebba3ea"
+					variableid="830a851f-ca57-4d7b-b036-ed8da63f3414"
+					variablename="logMessage">
+					</var>
+				</databinding>
+			</testmodule>
+			<testmodule
 			id="d5e005d0-9292-425b-83a0-12a234db8697"
 			name="CreateScreenShotPropertiesPanel"
 			ref="bbe1b453-6dad-446c-8f21-3104847f3bd8"
@@ -2703,6 +2711,16 @@
 			name="ValidateResultsAreEmpty">
 			</smartfoldernode>
 			<smartfoldernode
+			id="dccc7f9c-f810-41a2-ac32-047f0ebba3ea"
+			name="ImportantNote">
+				<parameters>
+					<param
+					name="importantNote"
+					value="IMPORTANT: The calculations for STPH are so fast that it is not possible to cancel them before they are finished.">
+					</param>
+				</parameters>
+			</smartfoldernode>
+			<smartfoldernode
 			id="deff5623-c634-47a5-ac6b-71e85668bc12"
 			name="CompareWithReference">
 			</smartfoldernode>
@@ -2837,6 +2855,26 @@
 			id="e9be0bd8-73c9-459d-8780-c29c79c8bceb"
 			name="SelectFolderCalculations">
 			</smartfoldernode>
+			<testmodule
+			id="e9ec7e88-1552-4bf6-b980-00a603623d9b"
+			name="SetRangeInSmartFolder"
+			ref="3b9354d6-0537-452c-9857-667f5c0e7124"
+			type="UserCode">
+				<databinding>
+					<var
+					dataname="nameSmartFolderToSetRange"
+					datasourceid="f6d96fab-6595-4246-839e-b68500a4836f"
+					variableid="e27c2717-8089-484f-8051-57077da63c0b"
+					variablename="nameOfSmartFolder">
+					</var>
+					<var
+					dataname="rangeLoopValidateNoResults"
+					datasourceid="ce3192fb-4dd8-4cb3-bf0b-4a6200047426"
+					variableid="cd1da467-8e84-488e-b503-621bd966f7be"
+					variablename="rangeToBeSetInSmartFolder">
+					</var>
+				</databinding>
+			</testmodule>
 			<smartfoldernode
 			id="ea633edf-b3b8-4ab8-a83b-dd90d488032a"
 			name="WaitSomeTime">
@@ -2958,6 +2996,12 @@
 			<smartfoldernode
 			id="f6d96fab-6595-4246-839e-b68500a4836f"
 			name="ValidateCancellation">
+				<parameters>
+					<param
+					name="nameSmartFolderToSetRange"
+					value="ValidateNoResultsAfterCanceling">
+					</param>
+				</parameters>
 			</smartfoldernode>
 			<smartfoldernode
 			id="f7f1eaf5-8ff2-4132-9857-2e781cbd4576"
@@ -2978,29 +3022,6 @@
 				</parameters>
 			</smartfoldernode>
 			<testmodule
-			id="f86701a6-c0bc-4a52-9acf-dfa494f42b84"
-			name="AppendString"
-			ref="ed043061-2b4f-4f84-b57b-5a205f5d26f9"
-			type="UserCode">
-				<description>
-					<![CDATA[+ calcName]]>
-				</description>
-				<databinding>
-					<var
-					dataname="pathToResultsInCalculation"
-					datasourceid="9ba0097d-cdfa-47ce-8c3e-cce3097adeea"
-					variableid="26242e38-327b-4a74-a725-5f16b6024635"
-					variablename="mainString">
-					</var>
-					<var
-					dataname="newNameDuplicatedCalculation"
-					datasourceid="ce1a1efa-836a-49b3-a1e4-55c011a0f359"
-					variableid="ac8b4a2f-fc21-444f-b33b-6207615639e2"
-					variablename="stringToAppendToMainString">
-					</var>
-				</databinding>
-			</testmodule>
-			<testmodule
 			id="f9893040-4903-48d0-888e-0675c5727c56"
 			name="AppendString"
 			ref="ed043061-2b4f-4f84-b57b-5a205f5d26f9"
@@ -3794,6 +3815,14 @@
 							id="04df8138-39fd-4fe4-83d7-2db576ce0540"
 							name="StartAndCancelCalculations">
 								<smartfoldernode
+								id="dccc7f9c-f810-41a2-ac32-047f0ebba3ea"
+								name="ImportantNote">
+									<testmodule
+									id="d59c759d-213d-4f26-813a-0ba1a30f02b2"
+									name="LogWarningMessage">
+									</testmodule>
+								</smartfoldernode>
+								<smartfoldernode
 								id="b56b1441-e7cf-4f34-902a-2b663737e035"
 								name="LoopFMs">
 									<smartfoldernode
@@ -3855,9 +3884,13 @@
 											name="ValidateTextMesage">
 											</testmodule>
 										</smartfoldernode>
+										<testmodule
+										id="e9ec7e88-1552-4bf6-b980-00a603623d9b"
+										name="SetRangeInSmartFolder">
+										</testmodule>
 										<smartfoldernode
 										id="9ba0097d-cdfa-47ce-8c3e-cce3097adeea"
-										name="ValidateNoResults">
+										name="ValidateNoResultsAfterCanceling">
 											<smartfoldernode
 											id="b33249a7-8fcd-48ac-9bab-7b30f161372c"
 											name="SelectResultsItem">
@@ -3866,14 +3899,6 @@
 												name="ConcatenateStrings">
 												</testmodule>
 												<testmodule
-												id="f86701a6-c0bc-4a52-9acf-dfa494f42b84"
-												name="AppendString">
-												</testmodule>
-												<testmodule
-												id="6f638719-100e-4959-a285-f13e148a2ae7"
-												name="AppendString">
-												</testmodule>
-												<testmodule
 												id="059b2618-f796-43b1-a519-e6c801232446"
 												name="SelectGenericItemInProjectExplorer">
 												</testmodule>
@@ -5853,6 +5878,9 @@
 				<column>
 					timeToWaitBeforeCancelling
 				</column>
+				<column>
+					rangeLoopValidateNoResults
+				</column>
 			</lastknowncolumns>
 			<maskedcolumns>
 			</maskedcolumns>
@@ -5867,6 +5895,9 @@
 					<th>
 						timeToWaitBeforeCancelling
 					</th>
+					<th>
+						rangeLoopValidateNoResults
+					</th>
 				</tr>
 				<tr>
 					<td>
@@ -5878,6 +5909,9 @@
 					<td>
 						0
 					</td>
+					<td>
+						1-3
+					</td>
 				</tr>
 				<tr>
 					<td>
@@ -5889,6 +5923,9 @@
 					<td>
 						4000
 					</td>
+					<td>
+						4-23
+					</td>
 				</tr>
 				<tr>
 					<td>
@@ -5900,6 +5937,9 @@
 					<td>
 						1000
 					</td>
+					<td>
+						24-31
+					</td>
 				</tr>
 				<tr>
 					<td>
@@ -5909,8 +5949,11 @@
 						36-2&gt;Kunstwerken - Hoogte kunstwerk&gt;Berekeningen
 					</td>
 					<td>
-						1000
+						2000
 					</td>
+					<td>
+						32-33
+					</td>
 				</tr>
 				<tr>
 					<td>
@@ -5920,7 +5963,11 @@
 						34-1&gt;Kunstwerken - Betrouwbaarheid sluiting kunstwerk&gt;Berekeningen
 					</td>
 					<td>
+						4000
 					</td>
+					<td>
+						34-36
+					</td>
 				</tr>
 				<tr>
 					<td>
@@ -5930,10 +5977,486 @@
 						44-2&gt;Kunstwerken - Sterkte en stabiliteit puntconstructies&gt;Berekeningen
 					</td>
 					<td>
+						4000
 					</td>
+					<td>
+						37-40
+					</td>
 				</tr>
 			</table>
 		</DataSource>
+		<DataSource
+		id="41df6bc7-84e7-4799-8eee-2febffe9a5ea"
+		lastknownrowcount="40"
+		name="script20a_LoopValidateNoResults"
+		type="Ranorex.Core.Data.SimpleDataConnector">
+			<lastknowncolumns>
+				<column>
+					iterationLabel
+				</column>
+				<column>
+					relativePathToRasultItemInPE
+				</column>
+				<column>
+					fmLabel
+				</column>
+			</lastknowncolumns>
+			<maskedcolumns>
+			</maskedcolumns>
+			<table>
+				<tr>
+					<th>
+						iterationLabel
+					</th>
+					<th>
+						relativePathToRasultItemInPE
+					</th>
+					<th>
+						fmLabel
+					</th>
+				</tr>
+				<tr>
+					<td>
+						12_2_02500 Segment_12004_1D1
+					</td>
+					<td>
+						&gt;12_2_02500&gt;12_2_02500 Segment_12004_1D1&gt;Resultaat
+					</td>
+					<td>
+						STPH
+					</td>
+				</tr>
+				<tr>
+					<td>
+						12_2_02500 Segment_12004_1D2
+					</td>
+					<td>
+						&gt;12_2_02500&gt;12_2_02500 Segment_12004_1D2&gt;Resultaat
+					</td>
+					<td>
+						STPH
+					</td>
+				</tr>
+				<tr>
+					<td>
+						12_2_02500 Segment_12004_1D3
+					</td>
+					<td>
+						&gt;12_2_02500&gt;12_2_02500 Segment_12004_1D3&gt;Resultaat
+					</td>
+					<td>
+						STPH
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel001: Results summary
+					</td>
+					<td>
+						&gt;profiel001&gt;Resultaat
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel001: Overtopping output (Sterkte berekening)
+					</td>
+					<td>
+						&gt;profiel001&gt;Resultaat&gt;Sterkte berekening
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel001: Dike height (HBN)
+					</td>
+					<td>
+						&gt;profiel001&gt;Resultaat&gt;HBN
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel001: Overtopping rate (Overslagdebiet)
+					</td>
+					<td>
+						&gt;profiel001&gt;Resultaat&gt;Overslagdebiet
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel002: Results summary
+					</td>
+					<td>
+						&gt;profiel002&gt;Resultaat
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel002: Overtopping output (Sterkte berekening)
+					</td>
+					<td>
+						&gt;profiel002&gt;Resultaat&gt;Sterkte berekening
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel002: Dike height (HBN)
+					</td>
+					<td>
+						&gt;profiel002&gt;Resultaat&gt;HBN
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel002: Overtopping rate (Overslagdebiet)
+					</td>
+					<td>
+						&gt;profiel002&gt;Resultaat&gt;Overslagdebiet
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel003: Results summary
+					</td>
+					<td>
+						&gt;profiel003&gt;Resultaat
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel003: Overtopping output (Sterkte berekening)
+					</td>
+					<td>
+						&gt;profiel003&gt;Resultaat&gt;Sterkte berekening
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel003: Dike height (HBN)
+					</td>
+					<td>
+						&gt;profiel003&gt;Resultaat&gt;HBN
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel003: Overtopping rate (Overslagdebiet)
+					</td>
+					<td>
+						&gt;profiel003&gt;Resultaat&gt;Overslagdebiet
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel004: Results summary
+					</td>
+					<td>
+						&gt;profiel004&gt;Resultaat
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel004: Overtopping output (Sterkte berekening)
+					</td>
+					<td>
+						&gt;profiel004&gt;Resultaat&gt;Sterkte berekening
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel004: Dike height (HBN)
+					</td>
+					<td>
+						&gt;profiel004&gt;Resultaat&gt;HBN
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel004: Overtopping rate (Overslagdebiet)
+					</td>
+					<td>
+						&gt;profiel004&gt;Resultaat&gt;Overslagdebiet
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel005: Results summary
+					</td>
+					<td>
+						&gt;profiel005&gt;Resultaat
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel005: Overtopping output (Sterkte berekening)
+					</td>
+					<td>
+						&gt;profiel005&gt;Resultaat&gt;Sterkte berekening
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel005: Dike height (HBN)
+					</td>
+					<td>
+						&gt;profiel005&gt;Resultaat&gt;HBN
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						profiel005: Overtopping rate (Overslagdebiet)
+					</td>
+					<td>
+						&gt;profiel005&gt;Resultaat&gt;Overslagdebiet
+					</td>
+					<td>
+						GEKB
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D2
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D2&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D3
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D3&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D4
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D4&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D6
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D6&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D7
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D7&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D1
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D1&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D8
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D8&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Vak_41-123 Vak_41-123_Segment_41009_1D5
+					</td>
+					<td>
+						&gt;Vak_41-123&gt;Vak_41-123 Vak_41-123_Segment_41009_1D5&gt;Resultaat
+					</td>
+					<td>
+						STBI
+					</td>
+				</tr>
+				<tr>
+					<td>
+						'Keersluis Cuijk'
+					</td>
+					<td>
+						&gt;'Keersluis Cuijk'&gt;Resultaat
+					</td>
+					<td>
+						HTKW
+					</td>
+				</tr>
+				<tr>
+					<td>
+						'Gemaal van Sasse'
+					</td>
+					<td>
+						&gt;'Gemaal van Sasse'&gt;Resultaat
+					</td>
+					<td>
+						HTKW
+					</td>
+				</tr>
+				<tr>
+					<td>
+						'Amersluis'
+					</td>
+					<td>
+						&gt;'Amersluis'&gt;Resultaat
+					</td>
+					<td>
+						BSKW
+					</td>
+				</tr>
+				<tr>
+					<td>
+						'Gemaal Schuddebeurs'
+					</td>
+					<td>
+						&gt;'Gemaal Schuddebeurs'&gt;Resultaat
+					</td>
+					<td>
+						BSKW
+					</td>
+				</tr>
+				<tr>
+					<td>
+						'Gemaal Hollandsch Diep'
+					</td>
+					<td>
+						&gt;'Gemaal Hollandsch Diep'&gt;Resultaat
+					</td>
+					<td>
+						BSKW
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Kunstwerk1
+					</td>
+					<td>
+						&gt;Kunstwerk1&gt;Resultaat
+					</td>
+					<td>
+						STKWp
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Kunstwerk2
+					</td>
+					<td>
+						&gt;Kunstwerk2&gt;Resultaat
+					</td>
+					<td>
+						STKWp
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Kunstwerk3
+					</td>
+					<td>
+						&gt;Kunstwerk3&gt;Resultaat
+					</td>
+					<td>
+						STKWp
+					</td>
+				</tr>
+				<tr>
+					<td>
+						Kunstwerk4
+					</td>
+					<td>
+						&gt;Kunstwerk4&gt;Resultaat
+					</td>
+					<td>
+						STKWp
+					</td>
+				</tr>
+			</table>
+		</DataSource>
 	</datasources>
 	<testconfigurations
 	default="TestRun">
@@ -6171,6 +6694,9 @@
 			id="da0cf389-9ca6-4380-adf2-6190cc8779f8">
 			</testcontainer>
 			<testcontainer
+			id="dccc7f9c-f810-41a2-ac32-047f0ebba3ea">
+			</testcontainer>
+			<testcontainer
 			id="deff5623-c634-47a5-ac6b-71e85668bc12">
 			</testcontainer>
 			<testcontainer