Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r4997c48d331087a7f1fa40a7874a6f7d6ab1abd4 -r5a66def262d2740442baf3a2719fa50e4e09b7d3
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 4997c48d331087a7f1fa40a7874a6f7d6ab1abd4)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 5a66def262d2740442baf3a2719fa50e4e09b7d3)
@@ -59,7 +59,8 @@
             var service = new HeightStructuresCalculationService();
 
             // Assert
-            Assert.IsInstanceOf<StructuresCalculationServiceBase<HeightStructuresValidationRulesRegistry, HeightStructuresInput, HeightStructure>>(service);
+            Assert.IsInstanceOf<StructuresCalculationServiceBase<HeightStructuresValidationRulesRegistry, HeightStructuresInput,
+                HeightStructure, HeightStructuresFailureMechanism>>(service);
         }
 
         [Test]
@@ -377,68 +378,6 @@
         }
 
         [Test]
-        public void Calculate_CalculationNull_ThrowArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var failureMechanism = new HeightStructuresFailureMechanism();
-
-            // Call
-            TestDelegate test = () => new HeightStructuresCalculationService().Calculate(null,
-                                                                                         assessmentSection,
-                                                                                         failureMechanism,
-                                                                                         string.Empty);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("calculation", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_AssessmentSectionNull_ThrowArgumentNullException()
-        {
-            // Setup
-            var calculation = new TestHeightStructuresCalculation();
-            var failureMechanism = new HeightStructuresFailureMechanism();
-
-            // Call
-            TestDelegate test = () => new HeightStructuresCalculationService().Calculate(calculation,
-                                                                                         null,
-                                                                                         failureMechanism,
-                                                                                         string.Empty);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("assessmentSection", exception.ParamName);
-        }
-
-        [Test]
-        public void Calculate_FailureMechanismNull_ThrowArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var calculation = new TestHeightStructuresCalculation();
-
-            // Call
-            TestDelegate test = () => new HeightStructuresCalculationService().Calculate(calculation,
-                                                                                         assessmentSection,
-                                                                                         null,
-                                                                                         string.Empty);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("failureMechanism", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         [TestCase(CalculationType.NoForeshore)]
         [TestCase(CalculationType.ForeshoreWithValidBreakWater)]
         [TestCase(CalculationType.ForeshoreWithoutBreakWater)]