Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r3ce8a0c103af363c8e00798d95588ebe4d1e04a5 -rb954fb6f2dd56ffb96be7b61ab129f19d879d2ab
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 3ce8a0c103af363c8e00798d95588ebe4d1e04a5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision b954fb6f2dd56ffb96be7b61ab129f19d879d2ab)
@@ -135,7 +135,7 @@
         [STAThread]
         public void GivenRingtoetsGuiWithStorageSql_WhenRunWithValidFile_ProjectSet()
         {
-            // Setup
+            // Given
             var projectStore = new StorageSqLite();
             Project fullProject = RingtoetsProjectHelper.GetFullTestProject();
             var expectedProjectName = Path.GetFileNameWithoutExtension(tempRingtoetsFile);
@@ -146,10 +146,10 @@
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, new GuiCoreSettings()))
             {
-                // Call
+                // When
                 Action action = () => gui.Run(tempRingtoetsFile);
 
-                // Assert
+                // Then
                 var expectedMessages = new[]
                 {
                     "Openen van bestaand Ringtoetsproject.",
@@ -169,16 +169,16 @@
         [STAThread]
         public void GivenRingtoetsGuiWithStorageSql_WhenRunWithInvalidFile_EmptyProjectSet()
         {
-            // Setup
+            // Given
             var testFile = "SomeFile";
             var projectStore = new StorageSqLite();
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, new GuiCoreSettings()))
             {
-                // Call
+                // When
                 Action action = () => gui.Run(testFile);
 
-                // Assert
+                // Then
                 var expectedMessages = new[]
                 {
                     "Openen van bestaand Ringtoetsproject.",
@@ -202,15 +202,15 @@
         [TestCase("  ")]
         public void GivenRingtoetsGuiWithStorageSql_WhenRunWithEmptyFile_EmptyProjectSet(string testFile)
         {
-            // Setup
+            // Given
             var projectStore = new StorageSqLite();
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, new GuiCoreSettings()))
             {
-                // Call
+                // When
                 Action action = () => gui.Run(testFile);
 
-                // Assert
+                // Then
                 var expectedMessages = new[]
                 {
                     "Nieuw project aanmaken..."