Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Handlers/DuneLocationsReplacementHandlerTest.cs
===================================================================
diff -u -r50d24a0bfc47a558a84c013611540c9f0f846caf -rc36d1359e5853619d9fcb8a57d3b5ee2e3d9f1d9
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Handlers/DuneLocationsReplacementHandlerTest.cs	(.../DuneLocationsReplacementHandlerTest.cs)	(revision 50d24a0bfc47a558a84c013611540c9f0f846caf)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Handlers/DuneLocationsReplacementHandlerTest.cs	(.../DuneLocationsReplacementHandlerTest.cs)	(revision c36d1359e5853619d9fcb8a57d3b5ee2e3d9f1d9)
@@ -88,31 +88,25 @@
         }
 
         [Test]
-        public void Replace_FailureMechanismHasDuneLocations_LocationsAndCalculationsCleared()
+        public void Replace_FailureMechanismHasDuneLocations_LocationsCleared()
         {
             // Setup
             var mocks = new MockRepository();
             var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
 
-            var duneLocations = new[]
+            var failureMechanism = new DuneErosionFailureMechanism
             {
-                new TestDuneLocation(),
-                new TestDuneLocation()
+                DuneLocations =
+                {
+                    new TestDuneLocation(),
+                    new TestDuneLocation()
+                }
             };
-            var failureMechanism = new DuneErosionFailureMechanism();
-            failureMechanism.DuneLocations.AddRange(duneLocations);
-            failureMechanism.SetDuneLocationCalculations(duneLocations);
-
             var handler = new DuneLocationsReplacementHandler(viewCommands, failureMechanism);
 
             // Precondition
             Assert.AreEqual(2, failureMechanism.DuneLocations.Count);
-            Assert.AreEqual(2, failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Count());
-            Assert.AreEqual(2, failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Count());
-            Assert.AreEqual(2, failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Count());
-            Assert.AreEqual(2, failureMechanism.CalculationsForLowerLimitNorm.Count());
-            Assert.AreEqual(2, failureMechanism.CalculationsForFactorizedLowerLimitNorm.Count());
 
             // Call
             handler.Replace(new HydraulicBoundaryLocation[]
@@ -122,16 +116,11 @@
 
             // Assert
             CollectionAssert.IsEmpty(failureMechanism.DuneLocations);
-            CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm);
-            CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificSignalingNorm);
-            CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm);
-            CollectionAssert.IsEmpty(failureMechanism.CalculationsForLowerLimitNorm);
-            CollectionAssert.IsEmpty(failureMechanism.CalculationsForFactorizedLowerLimitNorm);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void Replace_NewLocationsIsDune_LocationAndCalculationsAdded()
+        public void Replace_NewLocationsIsDune_LocationAdded()
         {
             // Setup
             var mocks = new MockRepository();
@@ -159,11 +148,10 @@
 
             // Assert
             Assert.AreEqual(1, failureMechanism.DuneLocations.Count);
-
             DuneLocation duneLocation = failureMechanism.DuneLocations.First();
+
             Assert.AreEqual(1, duneLocation.Id);
             Assert.AreEqual(new Point2D(205354, 609735), duneLocation.Location);
-            AssertDuneLocationCalculations(duneLocation, failureMechanism);
 
             mocks.VerifyAll();
         }
@@ -235,20 +223,5 @@
             // Assert
             mocks.VerifyAll(); // Expect no calls in 'viewCommands'
         }
-
-        private static void AssertDuneLocationCalculations(DuneLocation expectedDuneLocation, DuneErosionFailureMechanism failureMechanism)
-        {
-            AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Single());
-            AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Single());
-            AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Single());
-            AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForLowerLimitNorm.Single());
-            AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForFactorizedLowerLimitNorm.Single());
-        }
-
-        private static void AssertDefaultDuneLocationCalculation(DuneLocation expectedDuneLocation, DuneLocationCalculation calculation)
-        {
-            Assert.AreSame(expectedDuneLocation, calculation.DuneLocation);
-            Assert.IsNull(calculation.Output);
-        }
     }
 }
\ No newline at end of file