Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r06b2840a2bb64c0960c8ac29322b5a0971c73c77 -re89d90c26d2e93fe5fdc6af469636c702435524e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 06b2840a2bb64c0960c8ac29322b5a0971c73c77)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision e89d90c26d2e93fe5fdc6af469636c702435524e)
@@ -206,13 +206,14 @@
         {
             // Setup
             const string hydraulicLocationName = "name";
+            const string calculationName = "calculationName";
             string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
             var observableMock = mockRepository.StrictMock<IObservable>();
             observableMock.NotifyObservers();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(hydraulicLocationName)).Return("GetActivityName").Repeat.AtLeastOnce();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(hydraulicLocationName)).Return("GetCalculationName").Repeat.AtLeastOnce();
+            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(hydraulicLocationName)).Return("GetActivityName");
+            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(hydraulicLocationName)).Return(calculationName).Repeat.AtLeastOnce();
             mockRepository.ReplayAll();
 
             DialogBoxHandler = (name, wnd) =>
@@ -236,12 +237,11 @@
                 {
                     var msgs = messages.ToArray();
                     Assert.AreEqual(6, msgs.Length);
-                    string expectedName = "GetCalculationName";
-                    StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", expectedName), msgs.First());
-                    StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", expectedName), msgs.Skip(1).First());
-                    StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", expectedName), msgs.Skip(2).First());
-                    StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", expectedName), msgs.Skip(3).First());
-                    StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", expectedName), msgs.Last());
+                    StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs.First());
+                    StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs.Skip(1).First());
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs.Skip(2).First());
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs.Skip(3).First());
+                    StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", calculationName), msgs.Last());
                 });
             }
             mockRepository.VerifyAll();
@@ -383,19 +383,22 @@
         public void CalculateWaveHeights_ValidPathOneLocationInTheList_NotifyObserversAndLogsMessages()
         {
             // Setup
+            const string hydraulicLocationName = "name";
+            const string calculationName = "calculationName";
             string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
             var observableMock = mockRepository.StrictMock<IObservable>();
             observableMock.NotifyObservers();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(hydraulicLocationName)).Return("GetActivityName");
+            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(hydraulicLocationName)).Return(calculationName).Repeat.AtLeastOnce();
             mockRepository.ReplayAll();
 
             DialogBoxHandler = (name, wnd) =>
             {
                 // Expect an activity dialog which is automatically closed
             };
 
-            const string hydraulicLocationName = "name";
             var locations = new List<IHydraulicBoundaryLocation>
             {
                 new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3)
@@ -412,12 +415,11 @@
                 {
                     var msgs = messages.ToArray();
                     Assert.AreEqual(6, msgs.Length);
-                    string expectedName = string.Format("Golfhoogte voor locatie {0}", hydraulicLocationName);
-                    StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", expectedName), msgs.First());
-                    StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", expectedName), msgs.Skip(1).First());
-                    StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", expectedName), msgs.Skip(2).First());
-                    StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", expectedName), msgs.Skip(3).First());
-                    StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", expectedName), msgs.Last());
+                    StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs.First());
+                    StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs.Skip(1).First());
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs.Skip(2).First());
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs.Skip(3).First());
+                    StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", calculationName), msgs.Last());
                 });
             }
             mockRepository.VerifyAll();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a -re89d90c26d2e93fe5fdc6af469636c702435524e
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision e89d90c26d2e93fe5fdc6af469636c702435524e)
@@ -27,6 +27,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.HydraRing.Data;
 
@@ -214,8 +215,6 @@
             // Call
             Action call = () => activity.Run();
 
-            hydraulicBoundaryLocationMock.WaveHeight = (RoundedDouble) 2;
-
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
             {
@@ -394,11 +393,7 @@
             // Call
             activity.Finish();
 
-            // TEST FOR VERIFY
-            hydraulicBoundaryLocationMock.WaveHeight = (RoundedDouble) 789;
-
             // Assert
-            // Assert.AreEqual(waveHeight, hydraulicBoundaryLocationMock.WaveHeight, hydraulicBoundaryLocationMock.WaveHeight.GetAccuracy());
             mockRepository.VerifyAll();
         }
     }