Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r9787ccfe9d4b4d04798412da22d05fb34eee4f95 -r4c9281162ddc3a03e3e658addfad69f4b8f9762f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 9787ccfe9d4b4d04798412da22d05fb34eee4f95)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 4c9281162ddc3a03e3e658addfad69f4b8f9762f)
@@ -266,17 +266,6 @@
             return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
         }
 
-        private void CalculateAll(ClosingStructuresFailureMechanism failureMechanism,
-                                  IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations,
-                                  IAssessmentSection assessmentSection)
-        {
-            ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             calculations.Select(calc => new ClosingStructuresCalculationActivity(calc,
-                                                                                                                  assessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                                                  failureMechanism,
-                                                                                                                  assessmentSection)).ToArray());
-        }
-
         #region ViewInfo
 
         #region ClosingStructuresFailureMechanismView ViewInfo
@@ -385,7 +374,7 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N), 
+                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
@@ -462,7 +451,8 @@
 
         private void CalculateAll(ClosingStructuresFailureMechanismContext context)
         {
-            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<StructuresCalculation<ClosingStructuresInput>>(), context.Parent);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.Parent));
         }
 
         #endregion
@@ -674,7 +664,10 @@
 
         private void CalculateAll(CalculationGroup group, ClosingStructuresCalculationGroupContext context)
         {
-            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<StructuresCalculation<ClosingStructuresInput>>(), context.AssessmentSection);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData,
+                                                                                                                     context.FailureMechanism,
+                                                                                                                     context.AssessmentSection));
         }
 
         private static void AddCalculation(ClosingStructuresCalculationGroupContext context)
@@ -759,10 +752,9 @@
         private void Calculate(StructuresCalculation<ClosingStructuresInput> calculation, ClosingStructuresCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             new ClosingStructuresCalculationActivity(calculation,
-                                                                                      context.AssessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                      context.FailureMechanism,
-                                                                                      context.AssessmentSection));
+                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                   context.FailureMechanism,
+                                                                                                                   context.AssessmentSection));
         }
 
         private static void ValidateAll(ClosingStructuresCalculationContext context)
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs
===================================================================
diff -u -ra494bde768f1b989d31bff6a801a1816d6f9692e -r4c9281162ddc3a03e3e658addfad69f4b8f9762f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision a494bde768f1b989d31bff6a801a1816d6f9692e)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision 4c9281162ddc3a03e3e658addfad69f4b8f9762f)
@@ -32,7 +32,7 @@
     /// <summary>
     /// <see cref="CalculatableActivity"/> for running a structures closure calculation.
     /// </summary>
-    public class ClosingStructuresCalculationActivity : CalculatableActivity
+    internal class ClosingStructuresCalculationActivity : CalculatableActivity
     {
         private readonly StructuresCalculation<ClosingStructuresInput> calculation;
         private readonly ClosingStructuresCalculationService calculationService;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Properties/AssemblyInfo.cs
===================================================================
diff -u -r0819cf01b494097b764677be8dd47853e38fc223 -r4c9281162ddc3a03e3e658addfad69f4b8f9762f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 0819cf01b494097b764677be8dd47853e38fc223)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 4c9281162ddc3a03e3e658addfad69f4b8f9762f)
@@ -20,6 +20,8 @@
 // All rights reserved.
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Ringtoets.ClosingStructures.Service")]
-[assembly: AssemblyProduct("Ringtoets.ClosingStructures.Service")]
\ No newline at end of file
+[assembly: AssemblyProduct("Ringtoets.ClosingStructures.Service")]
+[assembly: InternalsVisibleTo("Ringtoets.ClosingStructures.Service.Test")]
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -ra4e84781ec7a739b46a6e46a4d724b48a29c6b0c -r4c9281162ddc3a03e3e658addfad69f4b8f9762f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision a4e84781ec7a739b46a6e46a4d724b48a29c6b0c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 4c9281162ddc3a03e3e658addfad69f4b8f9762f)
@@ -34,6 +34,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 ClosingStructuresFailureMechanism();
             var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, "", failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
 
             // Call
             Action call = () => activity.Run();
@@ -108,7 +111,10 @@
                 }
             };
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
+
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -169,7 +175,9 @@
                 }
             };
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -214,7 +222,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -271,7 +281,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -307,7 +319,10 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var calculation = new TestClosingStructuresCalculation();
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
+
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -342,7 +357,10 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var calculation = new TestClosingStructuresCalculation();
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
+
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -377,7 +395,10 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var calculation = new TestClosingStructuresCalculation();
 
-            var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection);
+            CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                  failureMechanism,
+                                                                                                                  assessmentSection);
+
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call