Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r757490d9e6f63d5f6dad69466095a4e1475e8769 -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 757490d9e6f63d5f6dad69466095a4e1475e8769)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -73,6 +73,8 @@
                     <fluent:BackstageTabControl>
                         <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_New}"
                                        x:Name="ButtonMenuFileNewProject"
+                                       AutomationProperties.AutomationId="ButtonMenuFileNewProject"
+                                       AutomationProperties.Name="ButtonMenuFileNewProject"
                                        Icon="/Core.Common.Gui;component\Resources\DocumentHS.png"
                                        fluent:KeyTip.Keys="N"
                                        Click="OnFileNewClicked" x:FieldModifier="private" />
@@ -85,12 +87,14 @@
 
                         <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Save_As}"
                                        x:Name="ButtonMenuFileSaveProjectAs"
+                                       AutomationProperties.AutomationId="ButtonMenuFileSaveProjectAs"
                                        Icon="/Core.Common.Gui;component\Resources\SaveAsHH.png"
                                        fluent:KeyTip.Keys="A" 
                                        Click="OnFileSaveAsClicked" x:FieldModifier="private" />
 
                         <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Open}"
                                        x:Name="ButtonMenuFileOpenProject"
+                                       AutomationProperties.AutomationId= "ButtonMenuFileOpenProject"
                                        Icon="/Core.Common.Gui;component\Resources\openfolderHS.png"
                                        fluent:KeyTip.Keys="O"
                                        Click="OnFileOpenClicked" x:FieldModifier="private" />
@@ -119,20 +123,26 @@
                 <fluent:QuickAccessMenuItem IsChecked="True">
                     <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_New}"
                                     x:Name="ButtonQuickAccessNewProject"
+                                    AutomationProperties.AutomationId="ButtonQuickAccessNewProject"
+                                    AutomationProperties.Name="ButtonQuickAccessNewProject"
                                     Icon="/Core.Common.Gui;component\Resources\DocumentHS.png"
                                     Click="OnFileNewClicked"/>
                 </fluent:QuickAccessMenuItem>
 
                 <fluent:QuickAccessMenuItem IsChecked="True">
                     <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Open}"
                                    x:Name="ButtonQuickAccessOpenProject"
+                                   AutomationProperties.AutomationId="ButtonQuickAccessOpenProject"
+                                   AutomationProperties.Name="ButtonQuickAccessOpenProject"
                                    Icon="/Core.Common.Gui;component\Resources\openfolderHS.png"
                                    Click="OnFileOpenClicked" />
                 </fluent:QuickAccessMenuItem>
 
                 <fluent:QuickAccessMenuItem IsChecked="True">
                     <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Save}" 
                                    x:Name="ButtonQuickAccessSaveProject"
+                                   AutomationProperties.AutomationId="ButtonQuickAccessSaveProject"
+                                   AutomationProperties.Name="ButtonQuickAccessSaveProject"
                                    Icon="/Core.Common.Gui;component\Resources\saveHS.png"
                                    Click="OnFileSaveClicked" />
                 </fluent:QuickAccessMenuItem>
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -rc2e4c57120878726b4ad1ea47ea6cbfe9ad2ac38 -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision c2e4c57120878726b4ad1ea47ea6cbfe9ad2ac38)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -88,6 +88,7 @@
             InitializeComponent();
 
             windowInteropHelper = new WindowInteropHelper(this);
+            Name = "RiskeerMainWindow";
         }
 
         /// <summary>
Index: Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs	(.../PropertyGridView.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs	(.../PropertyGridView.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -67,6 +67,7 @@
             PropertySort = PropertySort.Categorized;
 
             this.propertyResolver = propertyResolver;
+            Name = "PropertiesPanelGridView";
         }
 
         public void UpdateObserver()
Index: Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -82,6 +82,7 @@
                 Assert.AreEqual("MainWindow", mainWindow.Title);
                 Assert.AreEqual(ResizeMode.CanResizeWithGrip, mainWindow.ResizeMode);
                 Assert.AreEqual(FlowDirection.LeftToRight, mainWindow.FlowDirection);
+                Assert.AreEqual("RiskeerMainWindow", mainWindow.Name);
             }
         }
 
Index: Core/Common/test/Core.Common.Gui.Test/Forms/PropertyGridView/PropertyGridViewTest.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Core/Common/test/Core.Common.Gui.Test/Forms/PropertyGridView/PropertyGridViewTest.cs	(.../PropertyGridViewTest.cs)	(revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/PropertyGridView/PropertyGridViewTest.cs	(.../PropertyGridViewTest.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -38,11 +38,11 @@
         public void Constructor_PropertyResolverIsNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new Gui.Forms.PropertyGridView.PropertyGridView(null);
+            void Call() => new Gui.Forms.PropertyGridView.PropertyGridView(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("propertyResolver", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("propertyResolver", exception.ParamName);
         }
 
         [Test]
@@ -61,6 +61,7 @@
                 Assert.IsInstanceOf<IView>(propertyGridView);
                 Assert.IsNull(propertyGridView.Data);
                 Assert.AreEqual(PropertySort.Categorized, propertyGridView.PropertySort);
+                Assert.AreEqual("PropertiesPanelGridView", propertyGridView.Name);
 
                 ToolStrip toolStrip = propertyGridView.Controls.OfType<ToolStrip>().First();
                 Assert.AreEqual("Gecategoriseerd", toolStrip.Items[0].ToolTipText);
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/GeneralResultFaultTreeIllustrationPointView.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/GeneralResultFaultTreeIllustrationPointView.cs	(.../GeneralResultFaultTreeIllustrationPointView.cs)	(revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/GeneralResultFaultTreeIllustrationPointView.cs	(.../GeneralResultFaultTreeIllustrationPointView.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -68,6 +68,7 @@
 
             illustrationPointsControl.SelectionChanged += IllustrationPointsControlOnSelectionChanged;
             illustrationPointsFaultTreeControl.SelectionChanged += IllustrationPointsFaultTreeControlOnSelectionChanged;
+            Name = "GeneralResultFaultTreeIllustrationPointViewName";
         }
 
         public object Selection { get; private set; }
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/IllustrationPointsFaultTreeControl.cs
===================================================================
diff -u -r5fd764f8bc968f35e200824a360b44a0a02fdf3e -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/IllustrationPointsFaultTreeControl.cs	(.../IllustrationPointsFaultTreeControl.cs)	(revision 5fd764f8bc968f35e200824a360b44a0a02fdf3e)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/IllustrationPointsFaultTreeControl.cs	(.../IllustrationPointsFaultTreeControl.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -47,6 +47,7 @@
         {
             InitializeComponent();
             InitializeEventHandlers();
+            Name = "IllustrationPointsFaultTreeControl";
         }
 
         /// <summary>
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/GeneralResultFaultTreeIllustrationPointViewTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/GeneralResultFaultTreeIllustrationPointViewTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewTest.cs)	(revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/GeneralResultFaultTreeIllustrationPointViewTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewTest.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -64,11 +64,11 @@
         public void Constructor_GetGeneralResultFuncNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new GeneralResultFaultTreeIllustrationPointView(null);
+            void Call() => new GeneralResultFaultTreeIllustrationPointView(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("getGeneralResultFunc", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("getGeneralResultFunc", exception.ParamName);
         }
 
         [Test]
@@ -82,6 +82,7 @@
                 Assert.IsInstanceOf<IView>(view);
                 Assert.IsInstanceOf<ISelectionProvider>(view);
                 Assert.IsNull(view.Data);
+                Assert.AreEqual("GeneralResultFaultTreeIllustrationPointViewName", view.Name);
 
                 Assert.AreEqual(1, view.Controls.Count);
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/IllustrationPointsFaultTreeControlTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r5caf7b7a82d7d6803feb223fd0e13e629ca9a651
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/IllustrationPointsFaultTreeControlTest.cs	(.../IllustrationPointsFaultTreeControlTest.cs)	(revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/IllustrationPointsFaultTreeControlTest.cs	(.../IllustrationPointsFaultTreeControlTest.cs)	(revision 5caf7b7a82d7d6803feb223fd0e13e629ca9a651)
@@ -50,6 +50,7 @@
                 Assert.IsInstanceOf<ISelectionProvider>(control);
                 Assert.IsNull(control.Data);
                 Assert.IsNull(control.Selection);
+                Assert.AreEqual("IllustrationPointsFaultTreeControl", control.Name);
 
                 Assert.AreEqual(1, control.Controls.Count);
                 var pointedTreeGraphControl = control.Controls[0] as PointedTreeGraphControl;