Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs
===================================================================
diff -u -r87fcb2097e3a58e611c0de6913cb48851006f7af -r18a53a9b2a6c09a3af46cb9c023de3f323639f30
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs	(.../GrassCoverErosionInwardsInputViewInfoTest.cs)	(revision 87fcb2097e3a58e611c0de6913cb48851006f7af)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs	(.../GrassCoverErosionInwardsInputViewInfoTest.cs)	(revision 18a53a9b2a6c09a3af46cb9c023de3f323639f30)
@@ -109,18 +109,18 @@
             IAssessmentSection assessmentSection = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            GrassCoverErosionInwardsCalculation pipingCalculation = new GrassCoverErosionInwardsCalculation();
-            GrassCoverErosionInwardsCalculationContext pipingCalculationScenarioContext = new GrassCoverErosionInwardsCalculationContext(pipingCalculation,
+            GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation();
+            GrassCoverErosionInwardsCalculationContext calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation,
                                                                                                                      new GrassCoverErosionInwardsFailureMechanism(),
                                                                                                                      assessmentSection);
 
             using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView
             {
-                Data = pipingCalculation.InputParameters
+                Data = calculation.InputParameters
             })
             {
                 // Call
-                bool closeForData = info.CloseForData(view, pipingCalculationScenarioContext);
+                bool closeForData = info.CloseForData(view, calculationContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -135,20 +135,20 @@
             IAssessmentSection assessmentSection = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            GrassCoverErosionInwardsCalculation pipingCalculation = new GrassCoverErosionInwardsCalculation();
+            GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation();
             GrassCoverErosionInwardsCalculation calculationToRemove = new GrassCoverErosionInwardsCalculation();
 
-            GrassCoverErosionInwardsCalculationContext pipingCalculationScenarioContext = new GrassCoverErosionInwardsCalculationContext(calculationToRemove,
+            GrassCoverErosionInwardsCalculationContext calculationContext = new GrassCoverErosionInwardsCalculationContext(calculationToRemove,
                                                                                                                      new GrassCoverErosionInwardsFailureMechanism(),
                                                                                                                      assessmentSection);
 
             using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView
             {
-                Data = pipingCalculation.InputParameters
+                Data = calculation.InputParameters
             })
             {
                 // Call
-                bool closeForData = info.CloseForData(view, pipingCalculationScenarioContext);
+                bool closeForData = info.CloseForData(view, calculationContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
@@ -511,5 +511,31 @@
                 mocks.VerifyAll();
             }
         }
+
+        [Test]
+        public void AfterCreate_Always_SetsCalculationOnView()
+        {
+            // Setup
+            IAssessmentSection assessmentSection = mocks.StrictMock<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation();
+            GrassCoverErosionInwardsInputContext context = new GrassCoverErosionInwardsInputContext(calculation.InputParameters, calculation,
+                                                                new GrassCoverErosionInwardsFailureMechanism(), 
+                                                                assessmentSection);
+
+            using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView
+            {
+                Data = calculation.InputParameters
+            })
+            {
+                // Call
+                info.AfterCreate(view, context);
+
+                // Assert
+                Assert.AreSame(calculation, view.Calculation);
+                mocks.VerifyAll();
+            }
+        }
     }
 }