Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -393,7 +393,7 @@
             // Setup
             var scenario = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
 
             var registry = new PersistenceRegistry();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -1293,7 +1293,7 @@
                             },
                             CreateZones = false
                         },
-                        Output = new TestMacroStabilityInwardsOutput(),
+                        Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                         SemiProbabilisticOutput = new MacroStabilityInwardsSemiProbabilisticOutput(1, 0.7, 8.8, 0.9,
                                                                                                    10.10, 11.11)
                     }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs	(.../MacroStabilityInwardsCalculationScenarioTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs	(.../MacroStabilityInwardsCalculationScenarioTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -83,7 +83,7 @@
 
             var scenario = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(expectedProbability)
             };
 
@@ -129,7 +129,7 @@
             // Setup
             var scenario = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = null
             };
 
@@ -146,7 +146,7 @@
             // Setup
             var scenario = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(double.NaN)
             };
 
@@ -165,7 +165,7 @@
 
             var scenario = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(expectedProbability)
             };
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -155,7 +155,7 @@
             // Setup
             var calculation = new MacroStabilityInwardsCalculation
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
@@ -190,7 +190,7 @@
             // Setup
             var calculation = new MacroStabilityInwardsCalculation
             {
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
 
             // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsOutputTestFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsOutputTestFactoryTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsOutputTestFactoryTest.cs	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -0,0 +1,78 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+
+namespace Ringtoets.MacroStabilityInwards.Data.TestUtil.Test
+{
+    [TestFixture]
+    public class MacroStabilityInwardsOutputTestFactoryTest
+    {
+        [Test]
+        public void CreateOutput_WithoutParameters_ReturnsOutputWithExpectedProperties()
+        {
+            // Call
+            MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
+
+            // Assert
+            Assert.IsNotNull(output);
+            Assert.AreEqual(typeof(MacroStabilityInwardsOutput), output.GetType());
+
+            Assert.IsInstanceOf<MacroStabilityInwardsOutput>(output);
+            Assert.IsNotNull(output.SlidingCurve);
+            Assert.IsNotNull(output.SlipPlane);
+        }
+
+        [Test]
+        public void CreateOutput_WithParameters_ReturnsOutputWithExpectedProperties()
+        {
+            // Setup
+            var random = new Random(11);
+            double factorOfStability = random.NextDouble();
+            double zValue = random.NextDouble();
+            double forbiddenZonesXEntryMax = random.NextDouble();
+            double forbiddenZonesXEntryMin = random.NextDouble();
+
+            var properties = new MacroStabilityInwardsOutput.ConstructionProperties
+            {
+                FactorOfStability = factorOfStability,
+                ZValue = zValue,
+                ForbiddenZonesXEntryMax = forbiddenZonesXEntryMax,
+                ForbiddenZonesXEntryMin = forbiddenZonesXEntryMin
+            };
+
+            // Call
+            MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput(properties);
+
+            // Assert
+            Assert.IsNotNull(output);
+            Assert.AreEqual(typeof(MacroStabilityInwardsOutput), output.GetType());
+
+            Assert.AreEqual(factorOfStability, output.FactorOfStability);
+            Assert.AreEqual(zValue, output.ZValue);
+            Assert.AreEqual(forbiddenZonesXEntryMax, output.ForbiddenZonesXEntryMax);
+            Assert.AreEqual(forbiddenZonesXEntryMin, output.ForbiddenZonesXEntryMin);
+            Assert.IsNotNull(output.SlidingCurve);
+            Assert.IsNotNull(output.SlipPlane);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -64,7 +64,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Segment2DLoopCollectionHelperTest.cs" />
     <Compile Include="TestMacroStabilityInwardsFailureMechanismTest.cs" />
-    <Compile Include="TestMacroStabilityInwardsOutputTest.cs" />
+    <Compile Include="MacroStabilityInwardsOutputTestFactoryTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag b2f4b307c254c747a5cf01d2fb94970e5e954c36 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestMacroStabilityInwardsOutputTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs
===================================================================
diff -u -r7942301c23147aef9ebc84034d2f76dbe631a825 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs	(.../MacroStabilityInwardsCalculationScenarioFactory.cs)	(revision 7942301c23147aef9ebc84034d2f76dbe631a825)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs	(.../MacroStabilityInwardsCalculationScenarioFactory.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -57,7 +57,7 @@
                 random.NextDouble(),
                 random.NextDouble());
 
-            scenario.Output = new TestMacroStabilityInwardsOutput();
+            scenario.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             return scenario;
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsOutputTestFactory.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsOutputTestFactory.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsOutputTestFactory.cs	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -0,0 +1,59 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Ringtoets.MacroStabilityInwards.Data.TestUtil
+{
+    /// <summary>
+    /// Factory that creates instances of <see cref="MacroStabilityInwardsSemiProbabilisticOutput"/>
+    /// that can be used for testing.
+    /// </summary>
+    public class MacroStabilityInwardsOutputTestFactory
+    {
+        /// <summary>
+        /// Creates an instance of <see cref="MacroStabilityInwardsSemiProbabilisticOutput"/> with default values.
+        /// </summary>
+        /// <returns>A <see cref="MacroStabilityInwardsOutput"/>.</returns>
+        public static MacroStabilityInwardsOutput CreateOutput()
+        {
+            return CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties());
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="MacroStabilityInwardsSemiProbabilisticOutput"/>.
+        /// </summary>
+        /// <param name="properties">The container of the properties for the <see cref="MacroStabilityInwardsOutput"/>.</param>
+        /// <returns>A <see cref="MacroStabilityInwardsOutput"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="properties"/>
+        /// is <c>null</c>.</exception>
+        public static MacroStabilityInwardsOutput CreateOutput(MacroStabilityInwardsOutput.ConstructionProperties properties)
+        {
+            return new MacroStabilityInwardsOutput(new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(),
+                                                                                         MacroStabilityInwardsSlidingCircleTestFactory.Create(),
+                                                                                         new MacroStabilityInwardsSlice[0], 0, 0),
+                                                   new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridTestFactory.Create(),
+                                                                                               MacroStabilityInwardsGridTestFactory.Create(),
+                                                                                               new double[0]),
+                                                   properties);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs	(.../MacroStabilityInwardsTestDataGenerator.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs	(.../MacroStabilityInwardsTestDataGenerator.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -270,7 +270,7 @@
                     SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
             var calculationWithSurfaceLineAndSoilModel = new MacroStabilityInwardsCalculationScenario
@@ -291,7 +291,7 @@
                     SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
             var calculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario
@@ -321,7 +321,7 @@
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles.ElementAt(0)
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
             var subCalculationWithOutputAndHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario
@@ -333,7 +333,7 @@
                     StochasticSoilModel = stochasticSoilModel1,
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles.ElementAt(0)
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
             var subCalculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -66,7 +66,7 @@
     <Compile Include="Segment2DLoopCollectionHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestMacroStabilityInwardsFailureMechanism.cs" />
-    <Compile Include="TestMacroStabilityInwardsOutput.cs" />
+    <Compile Include="MacroStabilityInwardsOutputTestFactory.cs" />
     <Compile Include="MacroStabilityInwardsSemiProbabilisticOutputTestFactory.cs" />
   </ItemGroup>
   <ItemGroup>
Fisheye: Tag b2f4b307c254c747a5cf01d2fb94970e5e954c36 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs	(.../MacroStabilityInwardsCalculationRowTest.cs)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs	(.../MacroStabilityInwardsCalculationRowTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -282,12 +282,12 @@
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
-            TestMacroStabilityInwardsOutput assignedOutput = null;
+            MacroStabilityInwardsOutput assignedOutput = null;
 
             MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
             if (hasOutput)
             {
-                assignedOutput = new TestMacroStabilityInwardsOutput();
+                assignedOutput = MacroStabilityInwardsOutputTestFactory.CreateOutput();
             }
             calculation.Output = assignedOutput;
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs
===================================================================
diff -u -rb13759ad077f9e2b4104de000b5bdeafa9abe358 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision b13759ad077f9e2b4104de000b5bdeafa9abe358)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -884,7 +884,7 @@
 
                 if (useCalculationWithOutput)
                 {
-                    calculation.Output = new TestMacroStabilityInwardsOutput();
+                    calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
                 }
 
                 calculation.Attach(calculationObserver);
@@ -944,7 +944,7 @@
 
                 if (useCalculationWithOutput)
                 {
-                    calculation.Output = new TestMacroStabilityInwardsOutput();
+                    calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
                 }
 
                 calculation.Attach(calculationObserver);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs
===================================================================
diff -u -r8bfecdc9ee73e23debf1c933b9c121eca5de28e6 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs	(.../MacroStabilityInwardsOutputViewTest.cs)	(revision 8bfecdc9ee73e23debf1c933b9c121eca5de28e6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs	(.../MacroStabilityInwardsOutputViewTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -95,7 +95,7 @@
                 MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls<MacroStabilityInwardsOutputChartControl>(form, "macroStabilityInwardsOutputChartControl").Single();
 
                 MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
-                calculation.Output = new TestMacroStabilityInwardsOutput();
+                calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
                 // Call
                 view.Data = calculation;
@@ -134,7 +134,7 @@
         {
             // Setup
             MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
-            calculation.Output = new TestMacroStabilityInwardsOutput();
+            calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             using (var form = new Form())
             using (var view = new MacroStabilityInwardsOutputView
@@ -173,7 +173,7 @@
                 MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls<MacroStabilityInwardsOutputChartControl>(form, "macroStabilityInwardsOutputChartControl").Single();
 
                 MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
-                calculation.Output = new TestMacroStabilityInwardsOutput();
+                calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
                 view.Data = calculation;
 
@@ -209,7 +209,7 @@
                 Assert.IsNull(chartControl.Data);
 
                 // When
-                calculation.Output = new TestMacroStabilityInwardsOutput();
+                calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
                 calculation.NotifyObservers();
 
                 // Then
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -120,7 +120,7 @@
 
                 // Execute the first calculation and ensure the data grid view is updated
                 const double probability = 1.0 / 31846382.0;
-                calculation1.Output = new TestMacroStabilityInwardsOutput();
+                calculation1.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
                 calculation1.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(probability);
                 calculation1.NotifyObservers();
                 Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / calculation1.Probability),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs
===================================================================
diff -u -rb13759ad077f9e2b4104de000b5bdeafa9abe358 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs)	(revision b13759ad077f9e2b4104de000b5bdeafa9abe358)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -174,7 +174,7 @@
             var calculation = new MacroStabilityInwardsCalculationScenario();
             calculation.InputParameters.StochasticSoilModel = existingModel;
             calculation.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(0);
-            calculation.Output = new TestMacroStabilityInwardsOutput();
+            calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -r85b10b88eb31823c50ca052d34baacc6e006ad4c -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -278,12 +278,12 @@
             var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(0);
-            calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithNotUpdatedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             var calculationWithDeletedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithDeletedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithDeletedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(1);
-            calculationWithDeletedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithDeletedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             failureMechanism.CalculationsGroup.Children.Add(calculationWithDeletedProfile);
             failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile);
@@ -336,12 +336,12 @@
             var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithUpdatedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(0);
-            calculationWithUpdatedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithUpdatedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(1);
-            calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithNotUpdatedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile);
             failureMechanism.CalculationsGroup.Children.Add(calculationWithUpdatedProfile);
@@ -404,12 +404,12 @@
             var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(0);
-            calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithNotUpdatedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithUpdatedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(1);
-            calculationWithUpdatedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithUpdatedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             failureMechanism.CalculationsGroup.Children.Add(calculationWithUpdatedProfile);
             failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile);
@@ -455,7 +455,7 @@
             var calculation = new MacroStabilityInwardsCalculationScenario();
             calculation.InputParameters.StochasticSoilModel = existingModel;
             calculation.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles.ElementAt(0);
-            calculation.Output = new TestMacroStabilityInwardsOutput();
+            calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
@@ -506,12 +506,12 @@
             var calculationWithRemovedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithRemovedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithRemovedProfile.InputParameters.StochasticSoilProfile = removedProfile;
-            calculationWithRemovedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithRemovedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario();
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel;
             calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = unaffectedProfile;
-            calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput();
+            calculationWithNotUpdatedProfile.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile);
             failureMechanism.CalculationsGroup.Children.Add(calculationWithRemovedProfile);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs
===================================================================
diff -u -rb8493c6fb982b455e36129083cc009c5c07a7d05 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs	(.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs)	(revision b8493c6fb982b455e36129083cc009c5c07a7d05)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs	(.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -190,7 +190,7 @@
                 {
                     SurfaceLine = existingSurfaceLine
                 },
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -356,7 +356,7 @@
                 {
                     SurfaceLine = surfaceLine
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
@@ -404,7 +404,7 @@
                 {
                     SurfaceLine = affectedSurfaceLine
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
@@ -421,7 +421,7 @@
                 {
                     SurfaceLine = unaffectedSurfaceLine
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
@@ -488,7 +488,7 @@
                 {
                     SurfaceLine = removedSurfaceLine
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
@@ -505,7 +505,7 @@
                 {
                     SurfaceLine = unaffectedSurfaceLine
                 },
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
@@ -893,7 +893,7 @@
                 {
                     SurfaceLine = affectedSurfaceLine
                 },
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -rf2ba7f68f5de2fc3c8dec8baf7326808120cee52 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision f2ba7f68f5de2fc3c8dec8baf7326808120cee52)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -176,7 +176,7 @@
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var calculationWithOutput = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -rf2ba7f68f5de2fc3c8dec8baf7326808120cee52 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs)	(revision f2ba7f68f5de2fc3c8dec8baf7326808120cee52)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -178,7 +178,7 @@
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var calculationWithOutput = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -189,7 +189,7 @@
 
             group.Children.Add(new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             });
 
@@ -313,7 +313,7 @@
 
             group.Children.Add(new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             });
 
@@ -917,12 +917,12 @@
 
                 MacroStabilityInwardsCalculationScenario calculation1 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
                 calculation1.Name = "A";
-                calculation1.Output = new TestMacroStabilityInwardsOutput();
+                calculation1.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
                 calculation1.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
                 calculation1.Attach(calculation1Observer);
                 MacroStabilityInwardsCalculationScenario calculation2 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
                 calculation2.Name = "B";
-                calculation2.Output = new TestMacroStabilityInwardsOutput();
+                calculation2.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
                 calculation2.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
                 calculation2.Attach(calculation2Observer);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -109,7 +109,7 @@
             // Setup
             var calculation = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
@@ -191,7 +191,7 @@
             {
                 var calculation = new MacroStabilityInwardsCalculationScenario
                 {
-                    Output = new TestMacroStabilityInwardsOutput(),
+                    Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                     SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
                 };
                 var failureMechanism = new TestMacroStabilityInwardsFailureMechanism();
@@ -672,7 +672,7 @@
 
                 plugin.Gui = gui;
 
-                calculation.Output = new TestMacroStabilityInwardsOutput();
+                calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
                 calculation.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
                 calculation.Attach(observer);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -219,12 +219,12 @@
             {
                 var calculation1 = new MacroStabilityInwardsCalculationScenario
                 {
-                    Output = new TestMacroStabilityInwardsOutput(),
+                    Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                     SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
                 };
                 var calculation2 = new MacroStabilityInwardsCalculationScenario
                 {
-                    Output = new TestMacroStabilityInwardsOutput(),
+                    Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                     SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
                 };
 
@@ -296,7 +296,7 @@
             var failureMechanism = new TestMacroStabilityInwardsFailureMechanism();
             var calculation = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculation);
@@ -431,7 +431,7 @@
             {
                 var calculation = new MacroStabilityInwardsCalculationScenario
                 {
-                    Output = new TestMacroStabilityInwardsOutput(),
+                    Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                     SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
                 };
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rea495159c320abdbbd9fe4e4dd37c98672116c6b -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsOutputContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsOutputContextTreeNodeInfoTest.cs)	(revision ea495159c320abdbbd9fe4e4dd37c98672116c6b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsOutputContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsOutputContextTreeNodeInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -134,7 +134,7 @@
             // Setup
             var calculation = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
 
             // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs
===================================================================
diff -u -r3c535420f957462c1d525a532dad033434bf2ab7 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision 3c535420f957462c1d525a532dad033434bf2ab7)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -177,7 +177,7 @@
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var calculationWithOutput = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs
===================================================================
diff -u -rf2ba7f68f5de2fc3c8dec8baf7326808120cee52 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs)	(revision f2ba7f68f5de2fc3c8dec8baf7326808120cee52)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -176,7 +176,7 @@
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var calculationWithOutput = new MacroStabilityInwardsCalculationScenario
             {
-                Output = new TestMacroStabilityInwardsOutput()
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs	(.../MacroStabilityInwardsCalculationActivityTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs	(.../MacroStabilityInwardsCalculationActivityTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -82,8 +82,8 @@
         public void Run_InvalidMacroStabilityInwardsCalculationWithOutput_LogValidationStartAndEndWithErrors()
         {
             // Setup
-            var originalOutput = new TestMacroStabilityInwardsOutput();
-            var originalSemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
+            MacroStabilityInwardsOutput originalOutput = MacroStabilityInwardsOutputTestFactory.CreateOutput();
+            MacroStabilityInwardsSemiProbabilisticOutput originalSemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
 
             MacroStabilityInwardsCalculationScenario invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput();
             invalidMacroStabilityInwardsCalculation.Output = originalOutput;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -89,7 +89,7 @@
         public void Validate_InvalidCalculationWithOutput_ReturnsFalseNoOutputChange()
         {
             // Setup
-            var output = new TestMacroStabilityInwardsOutput();
+            MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
             MacroStabilityInwardsCalculation invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput();
             invalidMacroStabilityInwardsCalculation.Output = output;
 
@@ -390,7 +390,7 @@
         public void Calculate_ValidCalculationWithOutput_ShouldChangeOutput()
         {
             // Setup
-            var output = new TestMacroStabilityInwardsOutput();
+            MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             testCalculation.Output = output;
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs	(.../MacroStabilityInwardsDataSynchronizationServiceTest.cs)	(revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs	(.../MacroStabilityInwardsDataSynchronizationServiceTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -54,7 +54,7 @@
             // Setup
             var calculation = new MacroStabilityInwardsCalculation
             {
-                Output = new TestMacroStabilityInwardsOutput(),
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
                 SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
             };
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs
===================================================================
diff -u -rb8493c6fb982b455e36129083cc009c5c07a7d05 -rb2f4b307c254c747a5cf01d2fb94970e5e954c36
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs	(.../MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs)	(revision b8493c6fb982b455e36129083cc009c5c07a7d05)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs	(.../MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs)	(revision b2f4b307c254c747a5cf01d2fb94970e5e954c36)
@@ -75,7 +75,7 @@
                                                                              double expectedResult)
         {
             // Setup
-            var calculatorResult = new TestMacroStabilityInwardsOutput();
+            MacroStabilityInwardsOutput calculatorResult = MacroStabilityInwardsOutputTestFactory.CreateOutput();
             var probabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput
             {
                 SectionLength = assessmentSectionLength
@@ -101,7 +101,7 @@
                                                                              double contribution)
         {
             // Setup
-            var calculatorResult = new TestMacroStabilityInwardsOutput();
+            MacroStabilityInwardsOutput calculatorResult = MacroStabilityInwardsOutputTestFactory.CreateOutput();
             var probabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput
             {
                 SectionLength = assessmentSectionLength
@@ -132,7 +132,7 @@
             [Values(12, 24)] double contribution)
         {
             // Setup
-            var calculatorResult = new TestMacroStabilityInwardsOutput();
+            MacroStabilityInwardsOutput calculatorResult = MacroStabilityInwardsOutputTestFactory.CreateOutput();
             var probabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput
             {
                 SectionLength = assessmentSectionLength
@@ -159,7 +159,7 @@
         {
             // Setup
             var random = new Random(21);
-            var calculatorResult = new TestMacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties
+            MacroStabilityInwardsOutput calculatorResult = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties
             {
                 FactorOfStability = factorOfStability
             });
@@ -188,7 +188,7 @@
         {
             // Setup
             var random = new Random(21);
-            var calculatorResult = new TestMacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties
+            MacroStabilityInwardsOutput calculatorResult = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties
             {
                 FactorOfStability = factorOfStability
             });