Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst
===================================================================
diff -u -r82588073ddb8e42006c6e7bb5d631fda52df7502 -r5f3828fb61de3aa21ea927064fc7aa93d551d63b
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst	(.../AutomatedSystemTests.rxtst)	(revision 82588073ddb8e42006c6e7bb5d631fda52df7502)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst	(.../AutomatedSystemTests.rxtst)	(revision 5f3828fb61de3aa21ea927064fc7aa93d551d63b)
@@ -2038,7 +2038,6 @@
 				</databinding>
 			</testmodule>
 			<testmodule
-			enabled="False"
 			id="2f77973f-cbf2-4687-abc8-1412c4c9cc07"
 			name="CloseAUT"
 			ref="07688822-3eb6-4d71-a97b-33498ae1d748"
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs
===================================================================
diff -u -r9e6e1a95d2a146f3e6d39026f5c0ea6bcf339709 -r5f3828fb61de3aa21ea927064fc7aa93d551d63b
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision 9e6e1a95d2a146f3e6d39026f5c0ea6bcf339709)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision 5f3828fb61de3aa21ea927064fc7aa93d551d63b)
@@ -1411,7 +1411,7 @@
                 _bestandInfo = new RepoItemInfo(this, "Bestand", "?/?/text[@caption='Bestand']", 30000, null, "8ca7d8de-6c3a-48cd-98e3-444ddf09e011");
                 _buttonmenufilesaveprojectasInfo = new RepoItemInfo(this, "ButtonMenuFileSaveProjectAs", "?/?/button[@automationid='ButtonMenuFileSaveProjectAs']", 30000, null, "85528b1e-84f6-40a9-b2b7-58d99c5ad909");
                 _buttonmenufilenewprojectInfo = new RepoItemInfo(this, "ButtonMenuFileNewProject", "?/?/button[@automationid='ButtonMenuFileNewProject']", 30000, null, "9b0a050a-4689-4755-8f6d-c46dfe951fe7");
-                _addassessmentsectionbuttonInfo = new RepoItemInfo(this, "AddAssessmentSectionButton", ".//button[@automationid='AddAssessmentSectionButton']", 30000, null, "b862f8e9-14fb-4449-825c-ca6e151ff6c2");
+                _addassessmentsectionbuttonInfo = new RepoItemInfo(this, "AddAssessmentSectionButton", "list/?/?/button[@automationid='AddAssessmentSectionButton']", 30000, null, "b862f8e9-14fb-4449-825c-ca6e151ff6c2");
             }
 
             /// <summary>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep
===================================================================
diff -u -r9e6e1a95d2a146f3e6d39026f5c0ea6bcf339709 -r5f3828fb61de3aa21ea927064fc7aa93d551d63b
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision 9e6e1a95d2a146f3e6d39026f5c0ea6bcf339709)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision 5f3828fb61de3aa21ea927064fc7aa93d551d63b)
@@ -310,7 +310,7 @@
 				name="AddAssessmentSectionButton"
 				refimgid="b30bd1d0-a4cc-466c-9fea-d8b59803f065"
 				searchtimeout="30000ms">
-					/form[@automationid='RiskeerMainWindow']/menubar//button[@automationid='AddAssessmentSectionButton']
+					/form[@automationid='RiskeerMainWindow']/menubar/list/?/?/button[@automationid='AddAssessmentSectionButton']
 				</item>
 				<basepath>
 					/form[@automationid='RiskeerMainWindow']/menubar