Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst
===================================================================
diff -u -rb0c6dad6d614994cd4dd7f880ca275315e99c8ef -r36d78515c3dafe4660c1252ddd8063107c286aa4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst	(.../AutomatedSystemTests.rxtst)	(revision b0c6dad6d614994cd4dd7f880ca275315e99c8ef)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst	(.../AutomatedSystemTests.rxtst)	(revision 36d78515c3dafe4660c1252ddd8063107c286aa4)
@@ -969,7 +969,6 @@
 				</databinding>
 			</testmodule>
 			<testmodule
-			enabled="False"
 			id="170f46b0-fe63-4238-9874-af8420fa3e8f"
 			name="CloseAUT"
 			ref="07688822-3eb6-4d71-a97b-33498ae1d748"
@@ -3966,12 +3965,6 @@
 					variablename="calculatedCategoryBoundary">
 					</var>
 					<var
-					dataname="categoriesSuffix"
-					datasourceid="a19d64b1-9804-430e-b24d-b02b6bf6945a"
-					variableid="3f59ffa1-9268-4020-89db-834b5121cca0"
-					variablename="categorySuffix">
-					</var>
-					<var
 					dataname="prefix"
 					datasourceid="0b466300-a11b-4ace-860a-c951a79db2c2"
 					variableid="8a30822a-a8b0-4fa7-b364-eee06359becc"
@@ -4007,6 +4000,12 @@
 					variableid="78b35dc6-a224-4dc7-992a-f9b42e96fbaa"
 					variablename="boundaryType">
 					</var>
+					<var
+					dataname="suffixScope"
+					datasourceid="e4aa2fbe-8cc3-4c2e-8735-175a6a8ab1a4"
+					variableid="3f59ffa1-9268-4020-89db-834b5121cca0"
+					variablename="categorySuffix">
+					</var>
 				</databinding>
 				<missingdatabinding>
 					<var
@@ -4021,6 +4020,12 @@
 					variableid="9c0297fc-a6f9-4b34-b9da-205c21fac4e4"
 					variablename="lowerLimitText">
 					</var>
+					<var
+					dataname="categoriesSuffix"
+					datasourceid="a19d64b1-9804-430e-b24d-b02b6bf6945a"
+					variableid="3f59ffa1-9268-4020-89db-834b5121cca0"
+					variablename="categorySuffix">
+					</var>
 				</missingdatabinding>
 			</testmodule>
 			<smartfoldernode
@@ -4708,6 +4713,11 @@
 			id="739dbdee-cb57-479e-9461-6d944c1505e4"
 			name="teardown">
 			</teardown>
+			<smartfoldernode
+			datasource="tableScopeBoundaries"
+			id="73bba093-ff0b-403e-a5d4-33568e569c7c"
+			name="LoopScope(t_v)">
+			</smartfoldernode>
 			<testmodule
 			id="74354751-ba73-4f11-b592-d198491917b6"
 			name="ValidateSourcePathSubsurfaceStochasticModels"
@@ -6833,17 +6843,7 @@
 			<smartfoldernode
 			datasource="tableCategoriesPrefixes"
 			id="a19d64b1-9804-430e-b24d-b02b6bf6945a"
-			name="ValidateBoundariesTraject">
-				<parameters>
-					<param
-					name="categoriesSuffix"
-					value="t">
-					</param>
-					<param
-					name="substringSection"
-					value="">
-					</param>
-				</parameters>
+			name="LoopCategories(I_VI)">
 			</smartfoldernode>
 			<testmodule
 			id="a21427ac-0a51-4e66-b4ea-2e2800b1719f"
@@ -7076,6 +7076,7 @@
 			</testmodule>
 			<smartfoldernode
 			datasource="expectedErrorMessagesWhenNotIntersectingSurfaceLines"
+			errorbehavior="ContinueNextIteration"
 			id="a9476a5d-b871-4277-9188-1ebfe572836e"
 			name="ValidateErrorMessages">
 			</smartfoldernode>
@@ -7162,8 +7163,9 @@
 			</smartfoldernode>
 			<smartfoldernode
 			datasource="boundaryTypesNames"
+			errorbehavior="ContinueNextIteration"
 			id="aedd5571-96f0-44fd-9a62-fa76607ec249"
-			name="LoopBoundaryType">
+			name="LoopBoundaryType(LowerUpper)">
 				<parameters>
 					<param
 					name="expectedBoundaryValue"
@@ -7304,18 +7306,6 @@
 					variablename="categoryName">
 					</var>
 					<var
-					dataname="substringSection"
-					datasourceid="a19d64b1-9804-430e-b24d-b02b6bf6945a"
-					variableid="7f611ae2-9cdd-49ab-9f5c-3a3d10895d80"
-					variablename="sectionSubstring">
-					</var>
-					<var
-					dataname="categoriesSuffix"
-					datasourceid="a19d64b1-9804-430e-b24d-b02b6bf6945a"
-					variableid="b8671a42-1c75-4941-b387-69d720e545f8"
-					variablename="categorysuffix">
-					</var>
-					<var
 					dataname="prefixBoundaryType"
 					datasourceid="d28727ab-c53e-454f-bdd6-0451d5d86352"
 					variableid="8f75181e-5620-4184-b263-790e9b45c319"
@@ -7327,6 +7317,18 @@
 					variableid="74f78223-bbfe-48f3-8b40-2445e6a47468"
 					variablename="expectedBoundary">
 					</var>
+					<var
+					dataname="suffixScope"
+					datasourceid="e4aa2fbe-8cc3-4c2e-8735-175a6a8ab1a4"
+					variableid="b8671a42-1c75-4941-b387-69d720e545f8"
+					variablename="categorysuffix">
+					</var>
+					<var
+					dataname="substringScope"
+					datasourceid="e4aa2fbe-8cc3-4c2e-8735-175a6a8ab1a4"
+					variableid="7f611ae2-9cdd-49ab-9f5c-3a3d10895d80"
+					variablename="sectionSubstring">
+					</var>
 				</databinding>
 				<missingdatabinding>
 					<var
@@ -7335,6 +7337,18 @@
 					variableid="8f75181e-5620-4184-b263-790e9b45c319"
 					variablename="boundaryTypeSubstring">
 					</var>
+					<var
+					dataname="substringSection"
+					datasourceid="a19d64b1-9804-430e-b24d-b02b6bf6945a"
+					variableid="7f611ae2-9cdd-49ab-9f5c-3a3d10895d80"
+					variablename="sectionSubstring">
+					</var>
+					<var
+					dataname="categoriesSuffix"
+					datasourceid="a19d64b1-9804-430e-b24d-b02b6bf6945a"
+					variableid="b8671a42-1c75-4941-b387-69d720e545f8"
+					variablename="categorysuffix">
+					</var>
 				</missingdatabinding>
 			</testmodule>
 			<smartfoldernode
@@ -7756,10 +7770,6 @@
 					</param>
 				</parameters>
 			</smartfoldernode>
-			<smartfoldernode
-			id="b795459a-cbc9-44b8-808d-ecbcb138ed78"
-			name="d)DeterminationOfAssessmentRequirementsForSubSection(Vak)">
-			</smartfoldernode>
 			<testmodule
 			id="b82eab11-472c-4185-82c4-694c60a90d9d"
 			name="GetValueParameterForItemInTraject"
@@ -11634,28 +11644,28 @@
 								id="eb4954a5-f66b-4693-981d-d581746768ca"
 								name="ValidateBoundaries">
 									<smartfoldernode
-									id="a19d64b1-9804-430e-b24d-b02b6bf6945a"
-									name="ValidateBoundariesTraject">
+									id="73bba093-ff0b-403e-a5d4-33568e569c7c"
+									name="LoopScope(t_v)">
 										<smartfoldernode
-										id="aedd5571-96f0-44fd-9a62-fa76607ec249"
-										name="LoopBoundaryType">
-											<testmodule
-											id="5cf5f154-cb30-4728-8b81-be2f1c2230a9"
-											name="CalculateCategoryBoundary">
-											</testmodule>
-											<testmodule
-											id="b00fa597-7d2c-403b-98c9-b3b57af8a0ed"
-											name="ValidateCategoryBoundary">
-											</testmodule>
+										id="a19d64b1-9804-430e-b24d-b02b6bf6945a"
+										name="LoopCategories(I_VI)">
+											<smartfoldernode
+											id="aedd5571-96f0-44fd-9a62-fa76607ec249"
+											name="LoopBoundaryType(LowerUpper)">
+												<testmodule
+												id="5cf5f154-cb30-4728-8b81-be2f1c2230a9"
+												name="CalculateCategoryBoundary">
+												</testmodule>
+												<testmodule
+												id="b00fa597-7d2c-403b-98c9-b3b57af8a0ed"
+												name="ValidateCategoryBoundary">
+												</testmodule>
+											</smartfoldernode>
 										</smartfoldernode>
 									</smartfoldernode>
 								</smartfoldernode>
 							</smartfoldernode>
 						</smartfoldernode>
-						<smartfoldernode
-						id="b795459a-cbc9-44b8-808d-ecbcb138ed78"
-						name="d)DeterminationOfAssessmentRequirementsForSubSection(Vak)">
-						</smartfoldernode>
 						<teardown
 						id="f4d4d958-8b7c-427f-873c-e4ab538b83a8"
 						name="teardown">
@@ -17231,6 +17241,47 @@
 				</tr>
 			</table>
 		</DataSource>
+		<DataSource
+		id="e4aa2fbe-8cc3-4c2e-8735-175a6a8ab1a4"
+		lastknownrowcount="2"
+		name="tableScopeBoundaries"
+		type="Ranorex.Core.Data.SimpleDataConnector">
+			<lastknowncolumns>
+				<column>
+					suffixScope
+				</column>
+				<column>
+					substringScope
+				</column>
+			</lastknowncolumns>
+			<maskedcolumns>
+			</maskedcolumns>
+			<table>
+				<tr>
+					<th>
+						suffixScope
+					</th>
+					<th>
+						substringScope
+					</th>
+				</tr>
+				<tr>
+					<td>
+						t
+					</td>
+					<td>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						v
+					</td>
+					<td>
+						Section
+					</td>
+				</tr>
+			</table>
+		</DataSource>
 	</datasources>
 	<testconfigurations
 	default="TestRun">
@@ -17273,9 +17324,6 @@
 			id="36de5b8d-308c-4502-9938-6fab6ac232a3">
 			</testcontainer>
 			<testcontainer
-			id="37c811fd-9297-4d92-b429-28a452540bf1">
-			</testcontainer>
-			<testcontainer
 			id="42425944-15c7-418b-b5cd-a582e15b80df">
 			</testcontainer>
 			<testcontainer
@@ -17312,7 +17360,7 @@
 			id="645a1e46-fc85-4ee5-b48f-628d1c339748">
 			</testcontainer>
 			<testcontainer
-			id="72139e5e-316f-4a54-9d52-75f865439dd6">
+			id="73bba093-ff0b-403e-a5d4-33568e569c7c">
 			</testcontainer>
 			<testcontainer
 			id="78947188-1351-4994-baff-766da4b7d2e0">
@@ -17321,9 +17369,6 @@
 			id="78a783b3-ec47-4145-85f3-55c2b56b7aa0">
 			</testcontainer>
 			<testcontainer
-			id="78b7779b-7370-4e07-b1e4-d9a21ce890e1">
-			</testcontainer>
-			<testcontainer
 			id="7b0054c9-2118-49ba-881e-5da96a820b5a">
 			</testcontainer>
 			<testcontainer
@@ -17354,9 +17399,6 @@
 			id="b76df6f8-799c-4ff8-8df2-198969a6b4be">
 			</testcontainer>
 			<testcontainer
-			id="b795459a-cbc9-44b8-808d-ecbcb138ed78">
-			</testcontainer>
-			<testcontainer
 			id="bbc104ea-69c3-4dcd-8e50-5d1b60cd8d06">
 			</testcontainer>
 			<testcontainer
@@ -17381,18 +17423,12 @@
 			id="e3a5d86a-aed9-4cb2-9fd0-3f8149eb00ca">
 			</testcontainer>
 			<testcontainer
-			id="e5ae984b-bd5a-4a0a-9e27-8c0d4bf76e75">
-			</testcontainer>
-			<testcontainer
 			id="eb4954a5-f66b-4693-981d-d581746768ca">
 			</testcontainer>
 			<testcontainer
 			id="ee7b2bd4-7803-4972-bcb9-6a818edd0be0">
 			</testcontainer>
 			<testcontainer
-			id="f16b204f-b66b-40a0-82c1-8d62dcbc8b22">
-			</testcontainer>
-			<testcontainer
 			id="f4955a2d-d976-4dab-9a66-884a462172a4">
 			</testcontainer>
 			<testcontainer
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.UserCode.cs
===================================================================
diff -u -rb0c6dad6d614994cd4dd7f880ca275315e99c8ef -r36d78515c3dafe4660c1252ddd8063107c286aa4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.UserCode.cs	(.../ValidateCategoryBoundary.UserCode.cs)	(revision b0c6dad6d614994cd4dd7f880ca275315e99c8ef)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.UserCode.cs	(.../ValidateCategoryBoundary.UserCode.cs)	(revision 36d78515c3dafe4660c1252ddd8063107c286aa4)
@@ -9,6 +9,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Drawing;
@@ -33,10 +34,22 @@
             // Your recording specific initialization code goes here.
         }
 
-        public void Validate_GenericCategoryBoundaryCell(RepoItemInfo cellInfo)
+        public void Validate_GenericCategoryBoundaryCellAlmostEqual(RepoItemInfo cellInfo)
         {
-            Report.Log(ReportLevel.Info, "Validation", "Validating AttributeEqual (AccessibleValue=$expectedBoundary) on item 'cellInfo'.", cellInfo);
-            Validate.AttributeEqual(cellInfo, "AccessibleValue", expectedBoundary);
+            Report.Log(ReportLevel.Info, "Validation", "(Optional Action)\r\nValidating AttributeEqual (AccessibleValue=$expectedBoundary) on item 'cellInfo'.", cellInfo);
+            var currentValue = cellInfo.CreateAdapter<Cell>(true).GetAttributeValue<string>("AccessibleValue");
+            if (currentValue==expectedBoundary) {
+            	Validate.AttributeEqual(cellInfo, "AccessibleValue", expectedBoundary);
+            }
+            else {
+            	System.Globalization.CultureInfo currentCulture = CultureInfo.CurrentCulture;
+            	Report.Log(ReportLevel.Info, "Validation", "Value found: " + currentValue + " is not equal to expected value: " + expectedBoundary + "\r\nEvaluating whether they are almost (within 0.01%) equal...");
+            	var expectedDouble = 1.0/(Double.Parse(expectedBoundary.Substring(2,expectedBoundary.Length-2), currentCulture));
+            	var currentDouble = 1.0/(Double.Parse(currentValue.Substring(2,currentValue.Length-2), currentCulture));
+            	var deviation = Math.Abs(100.0*(expectedDouble - currentDouble) / expectedDouble);
+            	Report.Log(ReportLevel.Info, "Validation", "Deviation = " + deviation + " %");
+            	Validate.IsTrue(deviation<0.01);
+            }
         }
 
     }
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.cs
===================================================================
diff -u -rb0c6dad6d614994cd4dd7f880ca275315e99c8ef -r36d78515c3dafe4660c1252ddd8063107c286aa4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.cs	(.../ValidateCategoryBoundary.cs)	(revision b0c6dad6d614994cd4dd7f880ca275315e99c8ef)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.cs	(.../ValidateCategoryBoundary.cs)	(revision 36d78515c3dafe4660c1252ddd8063107c286aa4)
@@ -142,8 +142,7 @@
             
             Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.DocumentViewContainerUncached.ViewCategoryBoundaries.GenericCategoryBoundaries.GenericCategoryBoundaryCell, false, new RecordItemIndex(2));
             
-            Report.Log(ReportLevel.Info, "Validation", "Validating AttributeEqual (AccessibleValue=$expectedBoundary) on item 'RiskeerMainWindow.DocumentViewContainerUncached.ViewCategoryBoundaries.GenericCategoryBoundaries.GenericCategoryBoundaryCell'.", repo.RiskeerMainWindow.DocumentViewContainerUncached.ViewCategoryBoundaries.GenericCategoryBoundaries.GenericCategoryBoundaryCellInfo, new RecordItemIndex(3));
-            Validate.AttributeEqual(repo.RiskeerMainWindow.DocumentViewContainerUncached.ViewCategoryBoundaries.GenericCategoryBoundaries.GenericCategoryBoundaryCellInfo, "AccessibleValue", expectedBoundary);
+            Validate_GenericCategoryBoundaryCellAlmostEqual(repo.RiskeerMainWindow.DocumentViewContainerUncached.ViewCategoryBoundaries.GenericCategoryBoundaries.GenericCategoryBoundaryCellInfo);
             Delay.Milliseconds(0);
             
         }
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.rxrec
===================================================================
diff -u -rb0c6dad6d614994cd4dd7f880ca275315e99c8ef -r36d78515c3dafe4660c1252ddd8063107c286aa4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.rxrec	(.../ValidateCategoryBoundary.rxrec)	(revision b0c6dad6d614994cd4dd7f880ca275315e99c8ef)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateCategoryBoundary.rxrec	(.../ValidateCategoryBoundary.rxrec)	(revision 36d78515c3dafe4660c1252ddd8063107c286aa4)
@@ -89,33 +89,37 @@
 				</path>
 			</info>
 		</loggingrecorditem>
-		<validationitem
-		action="AttributeEqual"
+		<userrecorditem
+		classname="ValidateCategoryBoundary"
 		enabled="True"
-		optional="False"
-		searchpropertyid="e9eaca21-be7c-4311-9d71-d1c334243b00">
+		isexternaltestmethod="False"
+		methodname="Validate_GenericCategoryBoundaryCellAlmostEqual"
+		namespace="AutomatedSystemTests"
+		optional="False">
 			<comment>
 			</comment>
 			<bindings>
-				<binding
-				target="MatchValue"
-				variable="expectedBoundary">
-				</binding>
 			</bindings>
-			<info
-			id="c05e48a6-c497-43a0-9a7d-e3c812e6e11e"
-			sourcename="RepositoryEditor">
-				<path>
-					/form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismAssemblyCategoriesView']/?/container[@controlname='failureMechanism'+$sectionSubstring+'AssemblyGroupBox']/?/table/row[@accessiblevalue&gt;$categoryName+$categorysuffix]/cell[@accessiblename&gt;$boundaryTypeSubstring]
-				</path>
-			</info>
-			<matchname>
-				AccessibleValue
-			</matchname>
-			<matchvalue>
-				yourValue
-			</matchvalue>
-		</validationitem>
+			<arguments
+			id="c8c33f6a-5447-4fc1-96d9-18702cb6a5e7">
+				<argument
+				argname="cellInfo"
+				id="f8c68965-468e-4956-832e-f2cdc32e7c0b">
+					<argvaluetype>
+						Ranorex.Core.Repository.RepoItemInfo, Ranorex.Core, Culture=neutral
+					</argvaluetype>
+					<argvalue>
+					</argvalue>
+					<info
+					id="c05e48a6-c497-43a0-9a7d-e3c812e6e11e"
+					sourcename="ItemRecorderEditor">
+						<path>
+							/form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismAssemblyCategoriesView']/?/container[@controlname='failureMechanism'+$sectionSubstring+'AssemblyGroupBox']/?/table/row[@accessiblevalue&gt;$categoryName+$categorysuffix]/cell[@accessiblename&gt;$boundaryTypeSubstring]
+						</path>
+					</info>
+				</argument>
+			</arguments>
+		</userrecorditem>
 	</recorditems>
 	<repository
 	id="137723a5-e147-4b62-8c15-5c31a3d68f96"
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.UserCode.cs
===================================================================
diff -u -rcd75eeac6e33829dbab50bcc963eb3d59173c111 -r36d78515c3dafe4660c1252ddd8063107c286aa4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.UserCode.cs	(.../ValidateErrorIcon.UserCode.cs)	(revision cd75eeac6e33829dbab50bcc963eb3d59173c111)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.UserCode.cs	(.../ValidateErrorIcon.UserCode.cs)	(revision 36d78515c3dafe4660c1252ddd8063107c286aa4)
@@ -33,5 +33,13 @@
             // Your recording specific initialization code goes here.
         }
 
+        public void Validate_GenericCellIcon(RepoItemInfo cellInfo)
+        {
+            CompressedImage GenericCellIcon_ErrorIcon = repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIconInfo.GetErrorIcon(new Rectangle(0, 1, 17, 15));
+            Imaging.FindOptions GenericCellIcon_ErrorIcon_Options = Imaging.FindOptions.Parse("0.8;Edges;0,0,0,0;True;10000000;0ms");
+            Report.Log(ReportLevel.Info, "Validation", "(Optional Action)\r\nValidating ContainsImage (Screenshot: 'ErrorIcon' with region {X=0,Y=1,Width=17,Height=15}) on item 'cellInfo'.", cellInfo);
+            Validate.ContainsImage(cellInfo, GenericCellIcon_ErrorIcon, GenericCellIcon_ErrorIcon_Options, "Comparing with error icon", new Validate.Options(){ReportSimilarity=Validate.ResultOption.Always, ReportDifferenceImages=Validate.ResultOption.OnFail, ReportExpectedAndActualImages=Validate.ResultOption.Always});
+        }
+
     }
 }
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.cs
===================================================================
diff -u -rb0c6dad6d614994cd4dd7f880ca275315e99c8ef -r36d78515c3dafe4660c1252ddd8063107c286aa4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.cs	(.../ValidateErrorIcon.cs)	(revision b0c6dad6d614994cd4dd7f880ca275315e99c8ef)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.cs	(.../ValidateErrorIcon.cs)	(revision 36d78515c3dafe4660c1252ddd8063107c286aa4)
@@ -89,11 +89,8 @@
 
             Init();
 
-            try {
-                Report.Log(ReportLevel.Info, "Validation", "(Optional Action)\r\nValidating ContainsImage (Screenshot: 'ErrorIcon' with region {X=0,Y=1,Width=17,Height=15}) on item 'RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIcon'.", repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIconInfo, new RecordItemIndex(0));
-                Validate.ContainsImage(repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIconInfo, GenericCellIcon_ErrorIcon, GenericCellIcon_ErrorIcon_Options, "Comparing with error icon", new Validate.Options(){ReportSimilarity=Validate.ResultOption.Always, ReportDifferenceImages=Validate.ResultOption.OnFail, ReportExpectedAndActualImages=Validate.ResultOption.Always});
-                Delay.Milliseconds(100);
-            } catch(Exception ex) { Report.Log(ReportLevel.Warn, "Module", "(Optional Action) " + ex.Message, new RecordItemIndex(0)); }
+            Validate_GenericCellIcon(repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIconInfo);
+            Delay.Milliseconds(0);
             
         }
 
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.rxrec
===================================================================
diff -u -rcd75eeac6e33829dbab50bcc963eb3d59173c111 -r36d78515c3dafe4660c1252ddd8063107c286aa4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.rxrec	(.../ValidateErrorIcon.rxrec)	(revision cd75eeac6e33829dbab50bcc963eb3d59173c111)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateErrorIcon.rxrec	(.../ValidateErrorIcon.rxrec)	(revision 36d78515c3dafe4660c1252ddd8063107c286aa4)
@@ -25,39 +25,55 @@
 	<variables>
 	</variables>
 	<recorditems>
-		<validationitem
-		action="ContainsImage"
-		codegenpropertyname="GenericCellIcon_ErrorIcon"
-		duration="100ms"
+		<userrecorditem
+		classname="ValidateErrorIcon"
 		enabled="True"
-		imageoptions="1;Edges;0,0,0,0;True;10000000;0ms"
-		imagerect="0,1,17,15"
-		optional="True"
-		reportDifferenceImages="OnFail"
-		reportExpectedAndActualImages="Always"
-		reportsimilarity="Always"
-		screenshotguid="177d1f5e-b60b-4c93-b880-4e6a8dc84a69"
-		screenshotname="ErrorIcon"
-		searchpropertyid="8fbd9bcc-121a-4a9b-8c8a-0d1e62841131">
+		isexternaltestmethod="False"
+		methodname="Validate_GenericCellIcon"
+		namespace="AutomatedSystemTests"
+		optional="False">
 			<comment>
 			</comment>
 			<bindings>
 			</bindings>
-			<info
-			id="68d93ccb-0441-468c-9e9a-4028de2b4e0c"
-			sourcename="RepositoryEditor">
-				<path>
-					/form[@automationid='RiskeerMainWindow']//container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename='Row '+$indexRowMessage]/cell[@accessiblename=' Row 0']
-				</path>
-			</info>
-			<matchname>
-			</matchname>
-			<matchvalue>
-			</matchvalue>
-			<message>
-				Comparing with error icon
-			</message>
-		</validationitem>
+			<imagebasedlocations>
+				<imagebasedlocation
+				codegenpropertyname="GenericCellIcon_ErrorIcon"
+				editmode="ValidationEditModeRecorder"
+				imageoptions="1;Edges;0,0,0,0;True;10000000;0ms"
+				imagerect="0,1,17,15"
+				screenshotguid="177d1f5e-b60b-4c93-b880-4e6a8dc84a69"
+				screenshotname="ErrorIcon"
+				searchpropertyid="38db29aa-bac3-4380-b205-28e8f41a09a7">
+					<info
+					id="68d93ccb-0441-468c-9e9a-4028de2b4e0c"
+					sourcename="RepositoryEditor">
+						<path>
+							/form[@automationid='RiskeerMainWindow']//container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename='Row '+$indexRowMessage]/cell[@accessiblename=' Row 0']
+						</path>
+					</info>
+				</imagebasedlocation>
+			</imagebasedlocations>
+			<arguments
+			id="268ccbe0-f5ec-4e12-a194-8a5fc4641b68">
+				<argument
+				argname="cellInfo"
+				id="1dd0a9db-33d5-46f6-a053-4276c5071885">
+					<argvaluetype>
+						Ranorex.Core.Repository.RepoItemInfo, Ranorex.Core, Culture=neutral
+					</argvaluetype>
+					<argvalue>
+					</argvalue>
+					<info
+					id="68d93ccb-0441-468c-9e9a-4028de2b4e0c"
+					sourcename="ItemRecorderEditor">
+						<path>
+							/form[@automationid='RiskeerMainWindow']//container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename='Row '+$indexRowMessage]/cell[@accessiblename&gt;' Row']
+						</path>
+					</info>
+				</argument>
+			</arguments>
+		</userrecorditem>
 	</recorditems>
 	<repository
 	id="137723a5-e147-4b62-8c15-5c31a3d68f96"