Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs
===================================================================
diff -u -rdffa4d0d92f454b666480ee3d55d4ea444fb01b3 -r02b9cf02cd0f64f14f0a655e13fc2c778cb2046b
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs	(.../MacroStabilityInwardsFailureMechanismProperties.cs)	(revision dffa4d0d92f454b666480ee3d55d4ea444fb01b3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs	(.../MacroStabilityInwardsFailureMechanismProperties.cs)	(revision 02b9cf02cd0f64f14f0a655e13fc2c778cb2046b)
@@ -196,9 +196,8 @@
         {
             get
             {
-                MacroStabilityInwardsProbabilityAssessmentInput wrappedDataMacroStabilityInwardsProbabilityAssessmentInput = data.MacroStabilityInwardsProbabilityAssessmentInput;
-                return new RoundedDouble(2, wrappedDataMacroStabilityInwardsProbabilityAssessmentInput.GetSectionSpecificN(
-                                             wrappedDataMacroStabilityInwardsProbabilityAssessmentInput.SectionLength));
+                MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = data.MacroStabilityInwardsProbabilityAssessmentInput;
+                return new RoundedDouble(2, probabilityAssessmentInput.GetSectionSpecificN(probabilityAssessmentInput.SectionLength));
             }
         }
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r8e062ef408ff5e32cf4545c50960055b69c51586 -r02b9cf02cd0f64f14f0a655e13fc2c778cb2046b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs	(.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs)	(revision 8e062ef408ff5e32cf4545c50960055b69c51586)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs	(.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs)	(revision 02b9cf02cd0f64f14f0a655e13fc2c778cb2046b)
@@ -94,15 +94,16 @@
             Assert.AreEqual(failureMechanism.Code, properties.Code);
             Assert.AreEqual(isRelevant, properties.IsRelevant);
 
-            Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.A, properties.A);
-            Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.B, properties.B);
+            MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput;
+            Assert.AreEqual(probabilityAssessmentInput.A, properties.A);
+            Assert.AreEqual(probabilityAssessmentInput.B, properties.B);
             Assert.AreEqual(2, properties.N.NumberOfDecimalPlaces);
-            Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetSectionSpecificN(
-                                failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength),
+            Assert.AreEqual(probabilityAssessmentInput.GetSectionSpecificN(
+                                probabilityAssessmentInput.SectionLength),
                             properties.N,
                             properties.N.GetAccuracy());
             Assert.AreEqual(2, properties.SectionLength.NumberOfDecimalPlaces);
-            Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength,
+            Assert.AreEqual(probabilityAssessmentInput.SectionLength,
                             properties.SectionLength,
                             properties.SectionLength.GetAccuracy());
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs
===================================================================
diff -u -rb9e7df65b2b31d7b0c9faf17926dde1efbbf4cb4 -r02b9cf02cd0f64f14f0a655e13fc2c778cb2046b
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs	(.../PipingFailureMechanismProperties.cs)	(revision b9e7df65b2b31d7b0c9faf17926dde1efbbf4cb4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs	(.../PipingFailureMechanismProperties.cs)	(revision 02b9cf02cd0f64f14f0a655e13fc2c778cb2046b)
@@ -29,7 +29,6 @@
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -243,8 +242,8 @@
         {
             get
             {
-                return new RoundedDouble(2, data.PipingProbabilityAssessmentInput.GetSectionSpecificN(
-                                             data.PipingProbabilityAssessmentInput.SectionLength));
+                PipingProbabilityAssessmentInput probabilityAssessmentInput = data.PipingProbabilityAssessmentInput;
+                return new RoundedDouble(2, probabilityAssessmentInput.GetSectionSpecificN(probabilityAssessmentInput.SectionLength));
             }
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs
===================================================================
diff -u -rb9e7df65b2b31d7b0c9faf17926dde1efbbf4cb4 -r02b9cf02cd0f64f14f0a655e13fc2c778cb2046b
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs	(.../PipingFailureMechanismPropertiesTest.cs)	(revision b9e7df65b2b31d7b0c9faf17926dde1efbbf4cb4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs	(.../PipingFailureMechanismPropertiesTest.cs)	(revision 02b9cf02cd0f64f14f0a655e13fc2c778cb2046b)
@@ -32,7 +32,6 @@
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
@@ -96,31 +95,33 @@
             Assert.AreEqual(failureMechanism.Code, properties.Code);
             Assert.AreEqual(isRelevant, properties.IsRelevant);
 
-            Assert.AreEqual(failureMechanism.GeneralInput.UpliftModelFactor, properties.UpliftModelFactor);
+            GeneralPipingInput generalInput = failureMechanism.GeneralInput;
+            Assert.AreEqual(generalInput.UpliftModelFactor, properties.UpliftModelFactor);
 
-            Assert.AreEqual(failureMechanism.GeneralInput.SellmeijerModelFactor, properties.SellmeijerModelFactor);
+            Assert.AreEqual(generalInput.SellmeijerModelFactor, properties.SellmeijerModelFactor);
 
-            Assert.AreEqual(failureMechanism.GeneralInput.WaterVolumetricWeight, properties.WaterVolumetricWeight);
+            Assert.AreEqual(generalInput.WaterVolumetricWeight, properties.WaterVolumetricWeight);
 
-            Assert.AreEqual(failureMechanism.GeneralInput.CriticalHeaveGradient, properties.CriticalHeaveGradient);
+            Assert.AreEqual(generalInput.CriticalHeaveGradient, properties.CriticalHeaveGradient);
 
-            Assert.AreEqual(failureMechanism.GeneralInput.SandParticlesVolumicWeight, properties.SandParticlesVolumicWeight);
-            Assert.AreEqual(failureMechanism.GeneralInput.WhitesDragCoefficient, properties.WhitesDragCoefficient);
-            Assert.AreEqual(failureMechanism.GeneralInput.BeddingAngle, properties.BeddingAngle);
-            Assert.AreEqual(failureMechanism.GeneralInput.WaterKinematicViscosity, properties.WaterKinematicViscosity);
-            Assert.AreEqual(failureMechanism.GeneralInput.Gravity, properties.Gravity);
-            Assert.AreEqual(failureMechanism.GeneralInput.MeanDiameter70, properties.MeanDiameter70);
-            Assert.AreEqual(failureMechanism.GeneralInput.SellmeijerReductionFactor, properties.SellmeijerReductionFactor);
+            Assert.AreEqual(generalInput.SandParticlesVolumicWeight, properties.SandParticlesVolumicWeight);
+            Assert.AreEqual(generalInput.WhitesDragCoefficient, properties.WhitesDragCoefficient);
+            Assert.AreEqual(generalInput.BeddingAngle, properties.BeddingAngle);
+            Assert.AreEqual(generalInput.WaterKinematicViscosity, properties.WaterKinematicViscosity);
+            Assert.AreEqual(generalInput.Gravity, properties.Gravity);
+            Assert.AreEqual(generalInput.MeanDiameter70, properties.MeanDiameter70);
+            Assert.AreEqual(generalInput.SellmeijerReductionFactor, properties.SellmeijerReductionFactor);
 
-            Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.A, properties.A);
-            Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.B, properties.B);
+            PipingProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.PipingProbabilityAssessmentInput;
+            Assert.AreEqual(probabilityAssessmentInput.A, properties.A);
+            Assert.AreEqual(probabilityAssessmentInput.B, properties.B);
             Assert.AreEqual(2, properties.N.NumberOfDecimalPlaces);
-            Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetSectionSpecificN(
-                                failureMechanism.PipingProbabilityAssessmentInput.SectionLength),
+            Assert.AreEqual(probabilityAssessmentInput.GetSectionSpecificN(
+                                probabilityAssessmentInput.SectionLength),
                             properties.N,
                             properties.N.GetAccuracy());
             Assert.AreEqual(2, properties.SectionLength.NumberOfDecimalPlaces);
-            Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.SectionLength,
+            Assert.AreEqual(probabilityAssessmentInput.SectionLength,
                             properties.SectionLength,
                             properties.SectionLength.GetAccuracy());
             mockRepository.VerifyAll();