Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs
===================================================================
diff -u -r837f33af408325a33ac39bac002b91d18ad9675c -r47e96226f7d6d9f700642731ba2232ff024f30a7
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision 837f33af408325a33ac39bac002b91d18ad9675c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision 47e96226f7d6d9f700642731ba2232ff024f30a7)
@@ -41,7 +41,7 @@
         public void Constructor_CalculationNull_ThrowArgumentNullException()
         {
             // Setup
-            var waveConditionsInput = new WaveConditionsInput();
+            var waveConditionsInput = new TestWaveConditionsInput();
 
             var mocks = new MockRepository();
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
@@ -62,7 +62,7 @@
         public void Constructor_AssessmentSectionNull_ThrowArgumentNullException()
         {
             // Setup
-            var waveConditionsInput = new WaveConditionsInput();
+            var waveConditionsInput = new TestWaveConditionsInput();
             var calculation = new TestWaveConditionsCalculation();
 
             // Call
@@ -79,7 +79,7 @@
         public void Constructor_ValidInput_ExpectedValues()
         {
             // Setup
-            var waveConditionsInput = new WaveConditionsInput();
+            var waveConditionsInput = new TestWaveConditionsInput();
             var calculation = new TestWaveConditionsCalculation();
             var assessmentSection = new AssessmentSectionStub();
 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf -r47e96226f7d6d9f700642731ba2232ff024f30a7
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 47e96226f7d6d9f700642731ba2232ff024f30a7)
@@ -98,7 +98,7 @@
             var assessmentSection = new AssessmentSectionStub();
 
             var context = new TestWaveConditionsInputContext(
-                new WaveConditionsInput(),
+                new TestWaveConditionsInput(),
                 Enumerable.Empty<ForeshoreProfile>(),
                 assessmentSection);
 
@@ -116,7 +116,7 @@
         {
             // Setup
             var context = new TestWaveConditionsInputContext(
-                new WaveConditionsInput(),
+                new TestWaveConditionsInput(),
                 Enumerable.Empty<ForeshoreProfile>(),
                 new AssessmentSectionStub());
 
@@ -165,7 +165,7 @@
                     X0 = -3
                 });
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 ForeshoreProfile = foreshoreProfile,
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation,
@@ -224,7 +224,7 @@
 
             var assessmentSection = new AssessmentSectionStub();
 
-            var input = new WaveConditionsInput();
+            var input = new TestWaveConditionsInput();
             var foreshoreProfile = new TestForeshoreProfile();
 
             if (withForeshoreProfile)
@@ -377,7 +377,7 @@
             var upperBoundaryWaterLevels = (RoundedDouble) 5.88;
             const WaveConditionsInputStepSize stepSize = WaveConditionsInputStepSize.Half;
 
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 UpperBoundaryRevetment = upperBoundaryRevetment,
                 LowerBoundaryRevetment = lowerBoundaryRevetment,
@@ -487,7 +487,7 @@
 
             var assessmentSection = new AssessmentSectionStub();
 
-            var input = new WaveConditionsInput();
+            var input = new TestWaveConditionsInput();
             var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection);
 
             var properties = new TestWaveConditionsInputContextProperties(inputContext,
@@ -521,7 +521,7 @@
                 hydraulicBoundaryLocation
             });
 
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 ForeshoreProfile = new TestForeshoreProfile(new Point2D(200620.173572981, 503401.652985217))
             };
@@ -558,7 +558,7 @@
             mocks.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 ForeshoreProfile = new TestForeshoreProfile(new Point2D(200620.173572981, 503401.652985217))
@@ -601,7 +601,7 @@
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
 
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 ForeshoreProfile = new TestForeshoreProfile(new Point2D(200620.173572981, 503401.652985217))
@@ -650,7 +650,7 @@
             var assessmentSection = new AssessmentSectionStub();
             assessmentSection.SetHydraulicBoundaryLocationCalculations(locations);
 
-            var input = new WaveConditionsInput();
+            var input = new TestWaveConditionsInput();
             var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection);
 
             var properties = new TestWaveConditionsInputContextProperties(inputContext,
@@ -686,7 +686,7 @@
                 new HydraulicBoundaryLocation(2, "B", 0, 200)
             };
 
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 ForeshoreProfile = new TestForeshoreProfile()
             };
@@ -729,7 +729,7 @@
             var assessmentSection = new AssessmentSectionStub();
             assessmentSection.SetHydraulicBoundaryLocationCalculations(locations);
 
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 ForeshoreProfile = new TestForeshoreProfile()
             };
@@ -778,7 +778,7 @@
                 new TestForeshoreProfile()
             };
 
-            var input = new WaveConditionsInput();
+            var input = new TestWaveConditionsInput();
             var inputContext = new TestWaveConditionsInputContext(input, foreshoreProfiles, assessmentSection);
 
             var properties = new TestWaveConditionsInputContextProperties(inputContext,
@@ -803,7 +803,7 @@
             mocks.ReplayAll();
 
             var calculation = new TestWaveConditionsCalculation();
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 ForeshoreProfile = new TestForeshoreProfile()
             };
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs
===================================================================
diff -u -r1bbf51443c907b5f202e80764fa05f2e7f842c04 -r47e96226f7d6d9f700642731ba2232ff024f30a7
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs	(.../WaveConditionsInputForeshoreProfilePropertiesTest.cs)	(revision 1bbf51443c907b5f202e80764fa05f2e7f842c04)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs	(.../WaveConditionsInputForeshoreProfilePropertiesTest.cs)	(revision 47e96226f7d6d9f700642731ba2232ff024f30a7)
@@ -29,6 +29,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Data.TestUtil;
 using Ringtoets.Revetment.Forms.PropertyClasses;
 
 namespace Ringtoets.Revetment.Forms.Test.PropertyClasses
@@ -55,7 +56,7 @@
         public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues()
         {
             // Setup
-            var input = new WaveConditionsInput();
+            var input = new TestWaveConditionsInput();
             var properties = new WaveConditionsInputForeshoreProfileProperties();
 
             // Call
@@ -70,7 +71,7 @@
         public void Data_SetInputContextInstanceWithData_ReturnCorrectPropertyValues()
         {
             // Setup
-            var input = new WaveConditionsInput
+            var input = new TestWaveConditionsInput
             {
                 ForeshoreProfile = new TestForeshoreProfile(new[]
                 {
@@ -103,7 +104,7 @@
             observer.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties);
             mockRepository.ReplayAll();
 
-            var input = new WaveConditionsInput();
+            var input = new TestWaveConditionsInput();
             var properties = new WaveConditionsInputForeshoreProfileProperties
             {
                 Data = input
@@ -126,7 +127,7 @@
         public void PropertyAttributes_WithOrWithoutForeshoreProfileAndForelands_ReturnExpectedValues(bool withDikeProfile, int forlands, bool expectedCoordinatesPropertyReadOnly)
         {
             // Setup
-            var input = new WaveConditionsInput();
+            var input = new TestWaveConditionsInput();
 
             if (withDikeProfile)
             {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs
===================================================================
diff -u -rfd6fc8963fb4dbf6f2b5edae0991994983d6a1f6 -r47e96226f7d6d9f700642731ba2232ff024f30a7
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs	(.../TestWaveConditionsInputContext.cs)	(revision fd6fc8963fb4dbf6f2b5edae0991994983d6a1f6)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs	(.../TestWaveConditionsInputContext.cs)	(revision 47e96226f7d6d9f700642731ba2232ff024f30a7)
@@ -41,7 +41,7 @@
         /// </summary>
         /// <param name="wrappedData">The wrapped <see cref="WaveConditionsInput"/>.</param>
         public TestWaveConditionsInputContext(WaveConditionsInput wrappedData)
-            : this(wrappedData,
+            : this(wrappedData, 
                    new ForeshoreProfile[0],
                    new AssessmentSectionStub()) {}