Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs
===================================================================
diff -u -re6e0f3a201a644070997b531763b63f19d44df0e -r9eebc429ea44944d1a010e4f6b28dc4d9c20772f
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs	(.../StructuresCalculationServiceBaseTest.cs)	(revision e6e0f3a201a644070997b531763b63f19d44df0e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs	(.../StructuresCalculationServiceBaseTest.cs)	(revision 9eebc429ea44944d1a010e4f6b28dc4d9c20772f)
@@ -30,12 +30,10 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.Structures;
 using Ringtoets.Common.Service.TestUtil;
-using Ringtoets.HydraRing.Calculation.Calculator;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input;
@@ -613,8 +611,6 @@
             const string calculationPerformedMessage = "Calculation performed";
             var messageProvider = mocks.StrictMock<IStructuresCalculationMessageProvider>();
 
-
-            // TODO: WTI-1308 remove if statement when it's clear what needs to be done
             if (endInFailure && string.IsNullOrEmpty(lastErrorFileContent))
             {
                 messageProvider.Expect(mp => mp.GetCalculationFailedMessage(calculation.Name)).Return(calculationFailedMessage);
@@ -649,21 +645,14 @@
                 };
 
                 // Assert
-                TestHelper.AssertLogMessagesAndLoggedExceptions(call, messages =>
+                TestHelper.AssertLogMessages(call, messages =>
                 {
-                    Tuple<string, Level, Exception>[] generatedMessages = messages.ToArray();
-
-                    string[] msgs = generatedMessages.Select(msg => msg.Item1).ToArray();
+                    string[] msgs = messages.ToArray();
                     Assert.AreEqual(4, msgs.Length);
                     CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
                     Assert.AreEqual(calculationFailedMessage, msgs[1]);
                     Assert.AreEqual(calculationPerformedMessage, msgs[2]);
                     CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-
-                    if (!endInFailure && string.IsNullOrEmpty(lastErrorFileContent))
-                    {
-                        Assert.IsInstanceOf<HydraRingCalculationException>(generatedMessages[1].Item3);
-                    }
                 });
                 Assert.IsTrue(exceptionThrown);
                 Assert.IsNull(calculation.Output);