Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs
===================================================================
diff -u -rf86a0fa3e10e4c856ed487aa00c5fe3b22f1bbd2 -r30d04397762d075e567ef545ffb0a5e9c947435a
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision f86a0fa3e10e4c856ed487aa00c5fe3b22f1bbd2)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision 30d04397762d075e567ef545ffb0a5e9c947435a)
@@ -27,8 +27,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.DuneErosion.Plugin.Handlers;
@@ -38,10 +36,6 @@
 using Riskeer.Integration.Data;
 using Riskeer.Integration.IO.Handlers;
 using Riskeer.Integration.Plugin.Handlers;
-using Riskeer.Integration.TestUtil;
-using Riskeer.MacroStabilityInwards.Data;
-using Riskeer.Piping.Data.SemiProbabilistic;
-using Riskeer.Piping.Data.TestUtil;
 
 namespace Riskeer.Integration.Plugin.Test.Handlers
 {
@@ -244,7 +238,7 @@
             Assert.AreEqual(1, hydraulicBoundaryData.HydraulicBoundaryDatabases.Count);
 
             HydraulicBoundaryDatabase hydraulicBoundaryDatabase = hydraulicBoundaryData.HydraulicBoundaryDatabases.First();
-            
+
             Assert.AreEqual(hrdFilePath, hydraulicBoundaryDatabase.FilePath);
             Assert.AreEqual(readHydraulicBoundaryDatabase.Version, hydraulicBoundaryDatabase.Version);
             Assert.IsFalse(hydraulicBoundaryDatabase.UsePreprocessorClosure);
@@ -400,46 +394,6 @@
         }
 
         [Test]
-        public void GivenCalculationsWithLocation_WhenUpdatingDatabaseWithNewLocations_ThenCalculationOutputClearedAndChangedObjectsReturned()
-        {
-            // Given
-            var mocks = new MockRepository();
-            var duneLocationsReplacementHandler = mocks.Stub<IDuneLocationsReplacementHandler>();
-            mocks.ReplayAll();
-
-            const string hrdFilePath = "some/file/path";
-            const string hlcdFilePath = "some/hlcd/FilePath";
-            AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations();
-
-            ICalculation[] calculationsWithOutput = assessmentSection.GetFailureMechanisms()
-                                                                     .OfType<ICalculatableFailureMechanism>()
-                                                                     .SelectMany(fm => fm.Calculations)
-                                                                     .Where(c => c.HasOutput)
-                                                                     .ToArray();
-
-            calculationsWithOutput = calculationsWithOutput.Except(calculationsWithOutput.OfType<SemiProbabilisticPipingCalculationScenario>()
-                                                                                         .Where(c => c.InputParameters.UseAssessmentLevelManualInput))
-                                                           .Except(calculationsWithOutput.OfType<MacroStabilityInwardsCalculationScenario>()
-                                                                                         .Where(c => c.InputParameters.UseAssessmentLevelManualInput))
-                                                           .Except(calculationsWithOutput.OfType<TestPipingCalculationScenario>())
-                                                           .ToArray();
-
-            ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create();
-
-            var handler = new HydraulicBoundaryDataUpdateHandler(assessmentSection, duneLocationsReplacementHandler);
-
-            // When
-            IEnumerable<IObservable> changedObjects = handler.Update(assessmentSection.HydraulicBoundaryData, readHydraulicBoundaryDatabase,
-                                                                     ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(readHydraulicBoundaryDatabase.TrackId),
-                                                                     Enumerable.Empty<long>(), hrdFilePath);
-
-            // Then
-            Assert.IsTrue(calculationsWithOutput.All(c => !c.HasOutput));
-            CollectionAssert.IsSubsetOf(calculationsWithOutput, changedObjects);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void DoPostUpdateActions_Always_Perform()
         {
             // Setup
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r30d04397762d075e567ef545ffb0a5e9c947435a
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 30d04397762d075e567ef545ffb0a5e9c947435a)
@@ -81,22 +81,9 @@
                 }
             };
 
-            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
-            {
-                HydraulicBoundaryLocationCalculations =
-                {
-                    new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
-                }
-            });
+            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1));
+            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01));
 
-            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
-            {
-                HydraulicBoundaryLocationCalculations =
-                {
-                    new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
-                }
-            });
-
             assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
             {
                 hydraulicBoundaryLocation