Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r5dfdb174635068880c42c60d79cbe13e81925978 -r36a0572090807490a13ce587203a0927e60fc7b4
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs	(.../PipingCalculationConfigurationImporterTest.cs)	(revision 5dfdb174635068880c42c60d79cbe13e81925978)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs	(.../PipingCalculationConfigurationImporterTest.cs)	(revision 36a0572090807490a13ce587203a0927e60fc7b4)
@@ -665,20 +665,19 @@
                                                                       Enumerable.Empty<HydraulicBoundaryLocation>(),
                                                                       pipingFailureMechanism);
             importer.Import();
-            
+
             // When
             var random = new Random(33);
             GeneralPipingInput generalInputParameters = pipingFailureMechanism.GeneralInput;
             generalInputParameters.WaterVolumetricWeight = random.NextRoundedDouble(0, 20);
 
-
             // Then
             var expectedCalculation = new PipingCalculationScenario(generalInputParameters)
             {
                 Name = "Calculation"
             };
 
-            AssertPipingCalculationScenario(expectedCalculation, (PipingCalculationScenario)calculationGroup.Children[0]);
+            AssertPipingCalculationScenario(expectedCalculation, (PipingCalculationScenario) calculationGroup.Children[0]);
         }
 
         private static PipingFailureMechanism CreatePipingFailureMechanism()
@@ -697,33 +696,29 @@
         private static void AssertPipingCalculationScenario(PipingCalculationScenario expectedCalculation, PipingCalculationScenario actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
+            Assert.AreEqual(expectedCalculation.IsRelevant, actualCalculation.IsRelevant);
+            Assert.AreEqual(expectedCalculation.Contribution, actualCalculation.Contribution);
 
             PipingInput expectedInput = expectedCalculation.InputParameters;
             PipingInput actualInput = actualCalculation.InputParameters;
             Assert.AreEqual(expectedInput.UseAssessmentLevelManualInput, actualInput.UseAssessmentLevelManualInput);
             if (expectedInput.UseAssessmentLevelManualInput)
             {
-                Assert.AreEqual(expectedInput.AssessmentLevel.Value, actualInput.AssessmentLevel.Value);
+                Assert.AreEqual(expectedInput.AssessmentLevel, actualInput.AssessmentLevel);
             }
             else
             {
                 Assert.AreSame(expectedInput.HydraulicBoundaryLocation, actualInput.HydraulicBoundaryLocation);
             }
-
             Assert.AreEqual(expectedInput.WaterVolumetricWeight, actualInput.WaterVolumetricWeight);
 
-            Assert.AreSame(expectedInput.SurfaceLine, actualInput.SurfaceLine);
-            Assert.AreEqual(expectedInput.EntryPointL.Value, actualInput.EntryPointL.Value);
-            Assert.AreEqual(expectedInput.ExitPointL.Value, actualInput.ExitPointL.Value);
             Assert.AreSame(expectedInput.StochasticSoilModel, actualInput.StochasticSoilModel);
             Assert.AreSame(expectedInput.StochasticSoilProfile, actualInput.StochasticSoilProfile);
-            Assert.AreEqual(expectedInput.PhreaticLevelExit.Mean.Value, actualInput.PhreaticLevelExit.Mean.Value);
-            Assert.AreEqual(expectedInput.PhreaticLevelExit.StandardDeviation.Value, actualInput.PhreaticLevelExit.StandardDeviation.Value);
-            Assert.AreEqual(expectedInput.DampingFactorExit.Mean.Value, actualInput.DampingFactorExit.Mean.Value);
-            Assert.AreEqual(expectedInput.DampingFactorExit.StandardDeviation.Value, actualInput.DampingFactorExit.StandardDeviation.Value);
-
-            Assert.AreEqual(expectedCalculation.IsRelevant, actualCalculation.IsRelevant);
-            Assert.AreEqual(expectedCalculation.Contribution, actualCalculation.Contribution, actualCalculation.Contribution.GetAccuracy());
+            Assert.AreSame(expectedInput.SurfaceLine, actualInput.SurfaceLine);
+            Assert.AreEqual(expectedInput.EntryPointL, actualInput.EntryPointL);
+            Assert.AreEqual(expectedInput.ExitPointL, actualInput.ExitPointL);
+            DistributionAssert.AreEqual(expectedInput.PhreaticLevelExit, actualInput.PhreaticLevelExit);
+            DistributionAssert.AreEqual(expectedInput.DampingFactorExit, actualInput.DampingFactorExit);
         }
     }
 }
\ No newline at end of file