Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -reed032446ab1989c38508b8451818866e8dc7ad5 -r1e2a095affbb24361723e68107d3bf494276d6a2
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision eed032446ab1989c38508b8451818866e8dc7ad5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 1e2a095affbb24361723e68107d3bf494276d6a2)
@@ -342,19 +342,6 @@
             }
         }
 
-        private void CalculateAll(StabilityPointStructuresFailureMechanism failureMechanism,
-                                  IEnumerable<StructuresCalculation<StabilityPointStructuresInput>> calculations,
-                                  IAssessmentSection assessmentSection)
-        {
-            ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             calculations.Select(calc => new StabilityPointStructuresCalculationActivity(
-                                                                     calc,
-                                                                     assessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                     failureMechanism,
-                                                                     assessmentSection))
-                                                         .ToArray());
-        }
-
         #endregion
 
         #region TreeNodeInfo
@@ -473,7 +460,8 @@
 
         private void CalculateAll(StabilityPointStructuresFailureMechanismContext context)
         {
-            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<StructuresCalculation<StabilityPointStructuresInput>>(), context.Parent);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.Parent));
         }
 
         #endregion
@@ -711,7 +699,10 @@
 
         private void CalculateAll(CalculationGroup group, StabilityPointStructuresCalculationGroupContext context)
         {
-            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<StructuresCalculation<StabilityPointStructuresInput>>(), context.AssessmentSection);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivities(group,
+                                                                                                                            context.FailureMechanism,
+                                                                                                                            context.AssessmentSection));
         }
 
         #endregion
@@ -779,10 +770,9 @@
         private void Calculate(StructuresCalculation<StabilityPointStructuresInput> calculation, StabilityPointStructuresCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             new StabilityPointStructuresCalculationActivity(calculation,
-                                                                                             context.AssessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                             context.FailureMechanism,
-                                                                                             context.AssessmentSection));
+                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                          context.FailureMechanism,
+                                                                                                                          context.AssessmentSection));
         }
 
         private static void Validate(StabilityPointStructuresCalculationContext context)
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/Properties/AssemblyInfo.cs
===================================================================
diff -u -r0819cf01b494097b764677be8dd47853e38fc223 -r1e2a095affbb24361723e68107d3bf494276d6a2
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 0819cf01b494097b764677be8dd47853e38fc223)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 1e2a095affbb24361723e68107d3bf494276d6a2)
@@ -20,6 +20,8 @@
 // All rights reserved.
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Ringtoets.StabilityPointStructures.Service")]
-[assembly: AssemblyProduct("Ringtoets.StabilityPointStructures.Service")]
\ No newline at end of file
+[assembly: AssemblyProduct("Ringtoets.StabilityPointStructures.Service")]
+[assembly: InternalsVisibleTo("Ringtoets.StabilityPointStructures.Service.Test")]
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs
===================================================================
diff -u -ra494bde768f1b989d31bff6a801a1816d6f9692e -r1e2a095affbb24361723e68107d3bf494276d6a2
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs	(.../StabilityPointStructuresCalculationActivity.cs)	(revision a494bde768f1b989d31bff6a801a1816d6f9692e)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs	(.../StabilityPointStructuresCalculationActivity.cs)	(revision 1e2a095affbb24361723e68107d3bf494276d6a2)
@@ -32,7 +32,7 @@
     /// <summary>
     /// <see cref="CalculatableActivity"/> for running a structures stability point calculation.
     /// </summary>
-    public class StabilityPointStructuresCalculationActivity : CalculatableActivity
+    internal class StabilityPointStructuresCalculationActivity : CalculatableActivity
     {
         private readonly StructuresCalculation<StabilityPointStructuresInput> calculation;
         private readonly StabilityPointStructuresCalculationService calculationService;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -ra4e84781ec7a739b46a6e46a4d724b48a29c6b0c -r1e2a095affbb24361723e68107d3bf494276d6a2
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision a4e84781ec7a739b46a6e46a4d724b48a29c6b0c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 1e2a095affbb24361723e68107d3bf494276d6a2)
@@ -31,6 +31,7 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.IO.FileImporters;
+using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
@@ -64,7 +65,9 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, "", failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
 
             // Call
             Action call = () => activity.Run();
@@ -110,7 +113,10 @@
                 }
             };
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
+
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -172,7 +178,9 @@
                 }
             };
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -219,7 +227,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -275,7 +285,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -311,7 +323,9 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var calculation = new TestStabilityPointStructuresCalculation();
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -346,7 +360,9 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var calculation = new TestStabilityPointStructuresCalculation();
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -381,7 +397,9 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var calculation = new TestStabilityPointStructuresCalculation();
 
-            var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         failureMechanism,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call