Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r6ed9c7e3fd4c8b5bd967b2a39b97b04741cff8dc -r11d42ab635dac57e2decba16eaf672da35ee8580
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 6ed9c7e3fd4c8b5bd967b2a39b97b04741cff8dc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 11d42ab635dac57e2decba16eaf672da35ee8580)
@@ -181,7 +181,7 @@
                 var expectedMessages = new[]
                 {
                     "Openen van bestaand Ringtoetsproject.",
-                    "Bestaand Ringtoetsproject succesvol geopend.",
+                    "Bestaand Ringtoetsproject succesvol geopend."
                 };
                 TestHelper.AssertLogMessagesAreGenerated(action, expectedMessages, 3);
                 Assert.AreEqual(tempRingtoetsFile, gui.ProjectFilePath);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -rec3096516cbba4c5b7b45bf4d35ad5b1230b1c55 -r11d42ab635dac57e2decba16eaf672da35ee8580
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision ec3096516cbba4c5b7b45bf4d35ad5b1230b1c55)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 11d42ab635dac57e2decba16eaf672da35ee8580)
@@ -296,7 +296,7 @@
                                       new Point2D(2, 5), new[]
                                       {
                                           new Point2D(1, 6),
-                                          new Point2D(8, 5),
+                                          new Point2D(8, 5)
                                       }, new BreakWater(BreakWaterType.Caisson, 2.5), new ForeshoreProfile.ConstructionProperties
                                       {
                                           Name = "FP",
@@ -745,7 +745,7 @@
                 new Point3D(3.6, 6.0, 0.2), // Bottom ditch dike side
                 new Point3D(3.4, 6.0, 0.25), // Bottom ditch polder side
                 new Point3D(3.2, 6.0, 0.5), // Ditch polder side
-                new Point3D(3.0, 6.0, 0.5),
+                new Point3D(3.0, 6.0, 0.5)
             };
             surfaceLine.SetGeometry(geometryPoints);
 
@@ -791,7 +791,7 @@
                                                               new[]
                                                               {
                                                                   new RoughnessPoint(new Point2D(11, 12), 1),
-                                                                  new RoughnessPoint(new Point2D(13, 14), 0.5),
+                                                                  new RoughnessPoint(new Point2D(13, 14), 0.5)
                                                               },
                                                               new Point2D[0],
                                                               null,
@@ -1026,7 +1026,7 @@
                     }, new[]
                     {
                         new WaveConditionsOutput(7, 4, 1, 2),
-                        new WaveConditionsOutput(8, 3, 2, 1),
+                        new WaveConditionsOutput(8, 3, 2, 1)
                     })
                 });
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8723c31042f8aa4174e6d51a42f20d3665ec2da0 -r11d42ab635dac57e2decba16eaf672da35ee8580
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 11d42ab635dac57e2decba16eaf672da35ee8580)
@@ -576,7 +576,7 @@
             mocks.VerifyAll();
         }
 
-        private TreeNodeInfo GetInfo(RingtoetsPlugin plugin)
+        private static TreeNodeInfo GetInfo(RingtoetsPlugin plugin)
         {
             return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(HydraulicBoundaryDatabaseContext));
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioFactoryTest.cs
===================================================================
diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -r11d42ab635dac57e2decba16eaf672da35ee8580
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioFactoryTest.cs	(.../PipingCalculationScenarioFactoryTest.cs)	(revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioFactoryTest.cs	(.../PipingCalculationScenarioFactoryTest.cs)	(revision 11d42ab635dac57e2decba16eaf672da35ee8580)
@@ -54,8 +54,8 @@
             var scenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability, section);
 
             // Assert
-            Assert.NotNull(scenario.SemiProbabilisticOutput);
             Assert.NotNull(scenario.Output);
+            Assert.NotNull(scenario.SemiProbabilisticOutput);
             Assert.AreEqual(probability, scenario.SemiProbabilisticOutput.PipingProbability, 1e-6);
             Assert.IsTrue(scenario.IsRelevant);
         }
@@ -81,8 +81,8 @@
             var scenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
 
             // Assert
-            Assert.NotNull(scenario.SemiProbabilisticOutput);
             Assert.NotNull(scenario.Output);
+            Assert.NotNull(scenario.SemiProbabilisticOutput);
             Assert.IsNaN(scenario.SemiProbabilisticOutput.PipingProbability);
             Assert.IsTrue(scenario.IsRelevant);
         }
@@ -132,12 +132,12 @@
             var scenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section);
 
             // Assert
-            Assert.IsNull(scenario.SemiProbabilisticOutput);
             Assert.IsNull(scenario.Output);
+            Assert.IsNull(scenario.SemiProbabilisticOutput);
             Assert.IsTrue(scenario.IsRelevant);
         }
 
-        private FailureMechanismSection CreateSection()
+        private static FailureMechanismSection CreateSection()
         {
             return new FailureMechanismSection("name", new[]
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r8723c31042f8aa4174e6d51a42f20d3665ec2da0 -r11d42ab635dac57e2decba16eaf672da35ee8580
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 11d42ab635dac57e2decba16eaf672da35ee8580)
@@ -106,8 +106,8 @@
                 StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs.Last());
             });
             Assert.AreEqual(ActivityState.Failed, activity.State);
-            Assert.AreEqual(originalOutput, invalidPipingCalculation.Output);
-            Assert.AreEqual(originalSemiProbabilisticOutput, invalidPipingCalculation.SemiProbabilisticOutput);
+            Assert.AreSame(originalOutput, invalidPipingCalculation.Output);
+            Assert.AreSame(originalSemiProbabilisticOutput, invalidPipingCalculation.SemiProbabilisticOutput);
         }
 
         [Test]