Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -r412c54c9a315e683f0cd733409f44b5b8c9d8507 -ra9f365502f44e8c5cc83c4c777c50053beb9b283
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision 412c54c9a315e683f0cd733409f44b5b8c9d8507)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision a9f365502f44e8c5cc83c4c777c50053beb9b283)
@@ -89,23 +89,6 @@
         }
 
         [Test]
-        public void GetViewData_Always_ReturnsWrappedCalculation()
-        {
-            // Setup
-            var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
-            var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(calculation.InputParameters,
-                                                                                  calculation,
-                                                                                  new AssessmentSectionStub(),
-                                                                                  new GrassCoverErosionOutwardsFailureMechanism());
-
-            // Call
-            object viewData = info.GetViewData(context);
-
-            // Assert
-            Assert.AreSame(calculation, viewData);
-        }
-
-        [Test]
         public void CreateInstance_GrassCoverErosionOutwardsWaveConditionsInputContext_ReturnViewWithStylingApplied()
         {
             // Setup
@@ -125,7 +108,6 @@
 
             // Call 
             var view = (WaveConditionsInputView) info.CreateInstance(context);
-            view.Data = context.Calculation;
 
             // Assert
             ChartDataCollection chartData = view.Chart.Data;
@@ -172,7 +154,6 @@
 
             // Call
             var view = (WaveConditionsInputView) info.CreateInstance(context);
-            view.Data = context.Calculation;
 
             // Assert
             ChartDataCollection chartData = view.Chart.Data;
@@ -190,11 +171,9 @@
 
         protected override IView GetView(ICalculation data)
         {
-            return new WaveConditionsInputView(new GrassCoverErosionOutwardsWaveConditionsInputViewStyle(),
-                                               () => (RoundedDouble) 1.1)
-            {
-                Data = data
-            };
+            return new WaveConditionsInputView((ICalculation<WaveConditionsInput>) data, 
+                                               () => (RoundedDouble) 1.1, 
+                                               new GrassCoverErosionOutwardsWaveConditionsInputViewStyle());
         }
 
         protected override ICalculation GetCalculation()