Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs
===================================================================
diff -u -r5823 -r6139
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 5823)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 6139)
@@ -26,13 +26,15 @@
 using System.Text;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlOutput;
 using DGeoSuite.Common;
 using KellermanSoftware.CompareNetObjects;
 using NUnit.Framework;
+using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
 
 namespace Deltares.DamEngine.TestHelpers;
 
@@ -123,13 +125,15 @@
 
             foreach (DesignResult calculationResult in outputResults.CalculationResults)
             {
-                bool isDesignSuccessful = IsAdaptGeometrySuccessful(outputResults.CalculationMessages, calculationResult);
+                bool isDesignSuccessful = calculationResult.CalculationResult == ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded) && 
+                                          IsAdaptGeometrySuccessful(outputResults.CalculationMessages, calculationResult);
                 double fosRequired = FetchRequiredFactor(engineInterface, calculationResult.ScenarioName, calculationResult.LocationName);
                 double fosCalculated = FetchCalculatedFactor(engineInterface, calculationResult);
                 if (isDesignSuccessful)
                 {
-                    const string message = "After adapting the geometry, the calculated safety factor is less than the" +
-                                           " required safety factor; this is unexpected.";
+                    string message = "After adapting the geometry, the calculated safety factor is less than the required safety factor " +
+                                     $"for location '{calculationResult.LocationName}' and scenario '{calculationResult.ScenarioName}'. " +
+                                     "This is unexpected.";
                     Assert.That(fosCalculated, Is.GreaterThanOrEqualTo(fosRequired), message);
                 }
                 else