Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r770d15b5d6fbbb7cd41a61b68a25ebbd69a11526 -r805f1c45d686b1334f741f909441ee2dac73ee0e
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 770d15b5d6fbbb7cd41a61b68a25ebbd69a11526)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 805f1c45d686b1334f741f909441ee2dac73ee0e)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -65,7 +66,6 @@
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.TestUtil;
 using Riskeer.WaveImpactAsphaltCover.Data;
-using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources;
 
 namespace Riskeer.Storage.Core.Test.IntegrationTests
 {
@@ -188,7 +188,7 @@
 
             var guiCoreSettings = new GuiCoreSettings
             {
-                ApplicationIcon = CoreGuiTestUtilResources.TestIcon
+                ApplicationIcon = SystemIcons.Application
             };
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(() => null), guiCoreSettings))
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0e0eff94d9452eeebda5f68f183414d4ee3df413 -r805f1c45d686b1334f741f909441ee2dac73ee0e
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs)	(revision 0e0eff94d9452eeebda5f68f183414d4ee3df413)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs)	(revision 805f1c45d686b1334f741f909441ee2dac73ee0e)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0e0eff94d9452eeebda5f68f183414d4ee3df413 -r805f1c45d686b1334f741f909441ee2dac73ee0e
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 0e0eff94d9452eeebda5f68f183414d4ee3df413)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 805f1c45d686b1334f741f909441ee2dac73ee0e)
@@ -33,6 +33,7 @@
 using Core.Gui.Commands;
 using Core.Gui.ContextMenu;
 using Core.Gui.Forms.Main;
+using Core.Gui.TestUtil;
 using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0e0eff94d9452eeebda5f68f183414d4ee3df413 -r805f1c45d686b1334f741f909441ee2dac73ee0e
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 0e0eff94d9452eeebda5f68f183414d4ee3df413)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 805f1c45d686b1334f741f909441ee2dac73ee0e)
@@ -34,6 +34,7 @@
 using Core.Gui.ContextMenu;
 using Core.Gui.Forms.Main;
 using Core.Gui.Plugin;
+using Core.Gui.TestUtil;
 using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;