Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r94bb0b27fa19b633a3c09153a6d52c78868279b0 -rb194ffd0014b0e3251cb95bd1c73a3eb5c71290f
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 94bb0b27fa19b633a3c09153a6d52c78868279b0)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision b194ffd0014b0e3251cb95bd1c73a3eb5c71290f)
@@ -293,7 +293,7 @@
 
         private static void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            Exception exception = e.ExceptionObject as Exception ?? new Exception(CoreCommonGuiResources.App_AppDomain_UnhandledException_Unknown_exception_);
+            Exception exception = e.ExceptionObject as Exception ?? new Exception(CoreCommonGuiResources.App_Unhandled_exception);
 
             HandleExceptionOnMainThread(exception);
         }
@@ -320,7 +320,7 @@
 
         private static void HandleException(Exception exception)
         {
-            log.Error(CoreCommonGuiResources.App_AppDomain_UnhandledException_Unknown_exception_, exception);
+            log.Error(CoreCommonGuiResources.App_Unhandled_exception, exception);
 
             if (gui != null && gui.MainWindow != null)
             {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r92be34a088da8406be8d0cb37aa19b2462acebe0 -rb194ffd0014b0e3251cb95bd1c73a3eb5c71290f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 92be34a088da8406be8d0cb37aa19b2462acebe0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision b194ffd0014b0e3251cb95bd1c73a3eb5c71290f)
@@ -901,16 +901,6 @@
             AssertBreakWater(expectedInput.BreakWater, actualInput.BreakWater);
         }
 
-        private static void TearDownTempRingtoetsFile(string filePath)
-        {
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            if (!string.IsNullOrWhiteSpace(filePath) && File.Exists(filePath))
-            {
-                File.Delete(filePath);
-            }
-        }
-
         #region StabilityPointStructures FailureMechanism
 
         private static void AssertStabilityPointStructuresFailureMechanism(StabilityPointStructuresFailureMechanism expectedFailureMechanism,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs
===================================================================
diff -u -r736e0e16a55a0bd731f6847f85a148aa9f9f299a -rb194ffd0014b0e3251cb95bd1c73a3eb5c71290f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision 736e0e16a55a0bd731f6847f85a148aa9f9f299a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision b194ffd0014b0e3251cb95bd1c73a3eb5c71290f)
@@ -540,8 +540,7 @@
         [OneTimeTearDown]
         public void TearDown()
         {
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
+            CallGarbageCollector();
             directoryDisposeHelper.Dispose();
         }
 
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r92056906158ddd85bd0b82da96167997e08c289a -rb194ffd0014b0e3251cb95bd1c73a3eb5c71290f
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b194ffd0014b0e3251cb95bd1c73a3eb5c71290f)
@@ -110,15 +110,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Onbekende kritieke fout opgetreden..
-        /// </summary>
-        public static string App_AppDomain_UnhandledException_Unknown_exception_ {
-            get {
-                return ResourceManager.GetString("App_AppDomain_UnhandledException_Unknown_exception_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kan niet meerdere instanties van Ringtoets starten. Sluit eerst de andere instantie..
         /// </summary>
         public static string App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets_Please_close_the_other_instance_first {
@@ -138,6 +129,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Onbekende kritieke fout opgetreden..
+        /// </summary>
+        public static string App_Unhandled_exception {
+            get {
+                return ResourceManager.GetString("App_Unhandled_exception", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap application_import_blue {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r92056906158ddd85bd0b82da96167997e08c289a -rb194ffd0014b0e3251cb95bd1c73a3eb5c71290f
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision b194ffd0014b0e3251cb95bd1c73a3eb5c71290f)
@@ -139,7 +139,7 @@
   <data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="App_AppDomain_UnhandledException_Unknown_exception_" xml:space="preserve">
+  <data name="App_Unhandled_exception" xml:space="preserve">
     <value>Onbekende kritieke fout opgetreden.</value>
   </data>
   <data name="Ribbon_GroupBox_Show_Hide" xml:space="preserve">