Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs
===================================================================
diff -u -r19c6f79760da1309b849ed421990431f969c4f78 -r3f8a98df037e5ab1623b4d786a37bf3797b85f78
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs	(.../CalculationConfigurationImporter.cs)	(revision 19c6f79760da1309b849ed421990431f969c4f78)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs	(.../CalculationConfigurationImporter.cs)	(revision 3f8a98df037e5ab1623b4d786a37bf3797b85f78)
@@ -115,7 +115,7 @@
         /// <param name="readCalculation">The calculation read from XML.</param>
         /// <returns>A parsed calculation instance.</returns>
         /// <exception cref="CriticalFileValidationException">Thrown when something goes wrong while parsing.</exception>
-        protected abstract ICalculationBase ParseReadCalculation(TReadCalculation readCalculation);
+        protected abstract ICalculation ParseReadCalculation(TReadCalculation readCalculation);
 
         private ReadResult<IReadConfigurationItem> ReadConfiguration()
         {
@@ -169,7 +169,7 @@
             return calculationGroup;
         }
 
-        private ICalculationBase ParseReadCalculationInternal(TReadCalculation readCalculation)
+        private ICalculation ParseReadCalculationInternal(TReadCalculation readCalculation)
         {
             try
             {
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -r92df0a0ac0a4e0ccd5d7505d748f55167c2aac81 -r3f8a98df037e5ab1623b4d786a37bf3797b85f78
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 92df0a0ac0a4e0ccd5d7505d748f55167c2aac81)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 3f8a98df037e5ab1623b4d786a37bf3797b85f78)
@@ -28,6 +28,7 @@
 using Core.Common.Base.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.IO.FileImporters;
 using Ringtoets.Common.IO.Readers;
@@ -213,7 +214,7 @@
                 return new CalculationConfigurationReader(xmlFilePath);
             }
 
-            protected override ICalculationBase ParseReadCalculation(ReadCalculation readCalculation)
+            protected override ICalculation ParseReadCalculation(ReadCalculation readCalculation)
             {
                 return new TestCalculation
                 {
@@ -249,9 +250,15 @@
             public string Name { get; }
         }
 
-        private class TestCalculation : Observable, ICalculationBase
+        private class TestCalculation : Observable, ICalculation
         {
             public string Name { get; set; }
+            public bool HasOutput { get; }
+            public Comment Comments { get; }
+            public void ClearOutput()
+            {
+                throw new NotImplementedException();
+            }
         }
 
         private class ExpectedProgressNotification
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingCalculationConfigurationImporter.cs
===================================================================
diff -u -r5a0ad0f264935355e5739924708870db8513d5c1 -r3f8a98df037e5ab1623b4d786a37bf3797b85f78
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingCalculationConfigurationImporter.cs	(.../PipingCalculationConfigurationImporter.cs)	(revision 5a0ad0f264935355e5739924708870db8513d5c1)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingCalculationConfigurationImporter.cs	(.../PipingCalculationConfigurationImporter.cs)	(revision 3f8a98df037e5ab1623b4d786a37bf3797b85f78)
@@ -79,7 +79,7 @@
             return new PipingCalculationConfigurationReader(xmlFilePath);
         }
 
-        protected override ICalculationBase ParseReadCalculation(ReadPipingCalculation readCalculation)
+        protected override ICalculation ParseReadCalculation(ReadPipingCalculation readCalculation)
         {
             var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput())
             {