Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -rb0af17a5bd9c637b182784a75123ad2ca898b152 -r2a3c6a47bfb84ec01da0ff03451ed95ca4db3590
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision b0af17a5bd9c637b182784a75123ad2ca898b152)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 2a3c6a47bfb84ec01da0ff03451ed95ca4db3590)
@@ -85,6 +85,7 @@
 
         static App()
         {
+            SettingsHelper.Instance = new RingtoetsSettingsHelper();
             SetLanguage();
 
             string userDisplay = UserDisplay();
@@ -144,7 +145,6 @@
 
             Resources.Add(SystemParameters.MenuPopupAnimationKey, PopupAnimation.None);
 
-            SettingsHelper.Instance = new RingtoetsSettingsHelper();
             var settings = new GuiCoreSettings
             {
                 SupportEmailAddress = "www.helpdeskwater.nl",
Index: Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs
===================================================================
diff -u -rd74518566abeb501ea88b25f3111f9749853c5ed -r2a3c6a47bfb84ec01da0ff03451ed95ca4db3590
--- Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs	(.../AppTest.cs)	(revision d74518566abeb501ea88b25f3111f9749853c5ed)
+++ Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs	(.../AppTest.cs)	(revision 2a3c6a47bfb84ec01da0ff03451ed95ca4db3590)
@@ -25,6 +25,7 @@
 using Core.Common.Gui.Settings;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Integration.Forms;
 
 namespace Application.Ringtoets.Test
 {
@@ -57,6 +58,7 @@
 
                 // Assert
                 Assert.IsInstanceOf<System.Windows.Application>(app);
+                Assert.IsInstanceOf<RingtoetsSettingsHelper>(SettingsHelper.Instance);
                 app.Shutdown();
             });
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj
===================================================================
diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -r2a3c6a47bfb84ec01da0ff03451ed95ca4db3590
--- Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj	(.../Application.Ringtoets.Test.csproj)	(revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
+++ Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj	(.../Application.Ringtoets.Test.csproj)	(revision 2a3c6a47bfb84ec01da0ff03451ed95ca4db3590)
@@ -88,6 +88,10 @@
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Ringtoets\Integration\src\Ringtoets.Integration.Forms\Ringtoets.Integration.Forms.csproj">
+      <Project>{AD0CDC89-0A00-4068-AEEC-9838863C2FE8}</Project>
+      <Name>Ringtoets.Integration.Forms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Application.Ringtoets\Application.Ringtoets.csproj">
       <Project>{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}</Project>
       <Name>Application.Ringtoets</Name>