Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructureCollectionPropertyInfoTest.cs
===================================================================
diff -u -rcda0b786ef4c81469fb4213e7fc82cb74493fcf9 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructureCollectionPropertyInfoTest.cs	(.../ClosingStructureCollectionPropertyInfoTest.cs)	(revision cda0b786ef4c81469fb4213e7fc82cb74493fcf9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructureCollectionPropertyInfoTest.cs	(.../ClosingStructureCollectionPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresFailureMechanismContextPropertyInfoTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresFailureMechanismContextPropertyInfoTest.cs	(.../ClosingStructuresFailureMechanismContextPropertyInfoTest.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresFailureMechanismContextPropertyInfoTest.cs	(.../ClosingStructuresFailureMechanismContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresInputContextPropertyInfoTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresInputContextPropertyInfoTest.cs	(.../ClosingStructuresInputContextPropertyInfoTest.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresInputContextPropertyInfoTest.cs	(.../ClosingStructuresInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -re1a93747d105f27392f4bc0655694810c7d29f4d -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision e1a93747d105f27392f4bc0655694810c7d29f4d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -313,7 +313,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneErosionFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneErosionFailureMechanismPropertyInfoTest.cs	(.../DuneErosionFailureMechanismPropertyInfoTest.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneErosionFailureMechanismPropertyInfoTest.cs	(.../DuneErosionFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsFailureMechanismAsData()
+        public void CreateInstance_WithContext_SetsFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationPropertyInfoTest.cs
===================================================================
diff -u -r379841aa99f863993d1682aa1ed6e7cb771422a4 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationPropertyInfoTest.cs	(.../DuneLocationPropertyInfoTest.cs)	(revision 379841aa99f863993d1682aa1ed6e7cb771422a4)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationPropertyInfoTest.cs	(.../DuneLocationPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -48,7 +48,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsDuneLocationAsData()
+        public void CreateInstance_WithDuneLocation_SetsDuneLocationAsData()
         {
             // Setup
             var duneLocation = new DuneLocation(1, "", new Point2D(0, 0), new DuneLocation.ConstructionProperties());
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -ref5144459680cc600c8b6f349fd3774eb4511c24 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs	(.../DuneLocationsContextPropertyInfoTest.cs)	(revision ef5144459680cc600c8b6f349fd3774eb4511c24)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs	(.../DuneLocationsContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsDuneLocationsAsData()
+        public void CreateInstance_WithContext_SetsDuneLocationsAsData()
         {
             // Setup
             var mockRepository = new MockRepository();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs
===================================================================
diff -u -r596635491f58c61afee1fa7af173d5dd7a3496b9 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs	(.../DuneLocationsViewInfoTest.cs)	(revision 596635491f58c61afee1fa7af173d5dd7a3496b9)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs	(.../DuneLocationsViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -172,7 +172,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsExpectedProperties()
+        public void CreateInstance_WithContext_SetsExpectedProperties()
         {
             // Setup
             var mocks = new MockRepository();
@@ -183,7 +183,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new DuneErosionFailureMechanism();
-            var data = new DuneLocationsContext(
+            var context = new DuneLocationsContext(
                 new ObservableList<DuneLocation>(),
                 failureMechanism,
                 assessmentSection);
@@ -192,7 +192,7 @@
             plugin.Activate();
 
             // Call
-            using (var view = info.CreateInstance(data) as DuneLocationsView)
+            using (var view = info.CreateInstance(context) as DuneLocationsView)
             {
                 // Assert
                 Assert.AreSame(assessmentSection, view.AssessmentSection);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/DikeHeightOutputContextPropertyInfoTest.cs
===================================================================
diff -u -r25872f07e743010d1107ae920e95e0ba1a108cfa -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/DikeHeightOutputContextPropertyInfoTest.cs	(.../DikeHeightOutputContextPropertyInfoTest.cs)	(revision 25872f07e743010d1107ae920e95e0ba1a108cfa)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/DikeHeightOutputContextPropertyInfoTest.cs	(.../DikeHeightOutputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -58,7 +58,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithData()
+        public void CreateInstance_WithContext_NewPropertiesWithData()
         {
             // Setup
             var dikeHeightOutput = new TestDikeHeightOutput(10);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/DikeProfileCollectionPropertyInfoTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/DikeProfileCollectionPropertyInfoTest.cs	(.../DikeProfileCollectionPropertyInfoTest.cs)	(revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/DikeProfileCollectionPropertyInfoTest.cs	(.../DikeProfileCollectionPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithInputContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r6ac1d016e76120e778964de3ad7e2c0d6c837669 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsFailureMechanismPropertyInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismPropertyInfoTest.cs)	(revision 6ac1d016e76120e778964de3ad7e2c0d6c837669)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsFailureMechanismPropertyInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsInputContextPropertyInfoTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionInwardsInputContextPropertyInfoTest.cs)	(revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionInwardsInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithInputContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsOutputContextPropertyInfoTest.cs
===================================================================
diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsOutputContextPropertyInfoTest.cs	(.../GrassCoverErosionInwardsOutputContextPropertyInfoTest.cs)	(revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsOutputContextPropertyInfoTest.cs	(.../GrassCoverErosionInwardsOutputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -61,7 +61,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithData()
+        public void CreateInstance_WithContext_NewPropertiesWithData()
         {
             // Setup
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/OvertoppingOutputContextPropertyInfoTest.cs
===================================================================
diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/OvertoppingOutputContextPropertyInfoTest.cs	(.../OvertoppingOutputContextPropertyInfoTest.cs)	(revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/OvertoppingOutputContextPropertyInfoTest.cs	(.../OvertoppingOutputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -61,7 +61,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithData()
+        public void CreateInstance_WithContext_NewPropertiesWithData()
         {
             // Setup
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/OvertoppingRateOutputContextPropertyInfoTest.cs
===================================================================
diff -u -r25872f07e743010d1107ae920e95e0ba1a108cfa -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/OvertoppingRateOutputContextPropertyInfoTest.cs	(.../OvertoppingRateOutputContextPropertyInfoTest.cs)	(revision 25872f07e743010d1107ae920e95e0ba1a108cfa)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/OvertoppingRateOutputContextPropertyInfoTest.cs	(.../OvertoppingRateOutputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -58,7 +58,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithData()
+        public void CreateInstance_WithContext_NewPropertiesWithData()
         {
             var overtoppingRateOutput = new TestOvertoppingRateOutput(10);
             var calculation = new GrassCoverErosionInwardsCalculation
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs)	(revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -307,7 +307,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -r0f28eb71a18af127ad376776ebd2cd597a0aa5c5 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision 0f28eb71a18af127ad376776ebd2cd597a0aa5c5)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -52,7 +52,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsHydraulicBoundaryDatabaseAsData()
+        public void CreateInstance_WithContext_SetsHydraulicBoundaryDatabaseAsData()
         {
             // Setup
             var mockRepository = new MockRepository();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsFailureMechanismAsData()
+        public void CreateInstance_WithContext_SetsFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs
===================================================================
diff -u -rab5044d23f83bbc1b8906f23a2a541162c6e6464 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs)	(revision ab5044d23f83bbc1b8906f23a2a541162c6e6464)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ExpectedProperties()
+        public void CreateInstance_WithContext_ExpectedProperties()
         {
             // Setup
             const double assessmentLevel = 1.1;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -r0f28eb71a18af127ad376776ebd2cd597a0aa5c5 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextPropertyInfoTest.cs)	(revision 0f28eb71a18af127ad376776ebd2cd597a0aa5c5)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -52,7 +52,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsHydraulicBoundaryLocationsAsData()
+        public void CreateInstance_WithContext_SetsHydraulicBoundaryLocationsAsData()
         {
             // Setup
             var mockRepository = new MockRepository();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -r0226807215afa67cd8769b30e0b7af5a5dfce001 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs)	(revision 0226807215afa67cd8769b30e0b7af5a5dfce001)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -90,7 +90,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsExpectedProperties()
+        public void CreateInstance_WithContext_SetsExpectedProperties()
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
@@ -105,7 +105,7 @@
 
                 var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-                var data = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
+                var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
                     new ObservableList<HydraulicBoundaryLocation>(),
                     assessmentSection,
                     grassCoverErosionOutwardsFailureMechanism);
@@ -114,7 +114,7 @@
                 plugin.Activate();
 
                 // Call
-                var view = info.CreateInstance(data) as GrassCoverErosionOutwardsDesignWaterLevelLocationsView;
+                var view = info.CreateInstance(context) as GrassCoverErosionOutwardsDesignWaterLevelLocationsView;
 
                 // Assert
                 Assert.AreSame(assessmentSection, view.AssessmentSection);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -r0226807215afa67cd8769b30e0b7af5a5dfce001 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs)	(revision 0226807215afa67cd8769b30e0b7af5a5dfce001)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -90,7 +90,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsExpectedProperties()
+        public void CreateInstance_WithContext_SetsExpectedProperties()
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
@@ -105,7 +105,7 @@
 
                 var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-                var data = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
+                var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
                     new ObservableList<HydraulicBoundaryLocation>(),
                     assessmentSection,
                     grassCoverErosionOutwardsFailureMechanism);
@@ -114,7 +114,7 @@
                 plugin.Activate();
 
                 // Call
-                var view = info.CreateInstance(data) as GrassCoverErosionOutwardsWaveHeightLocationsView;
+                var view = info.CreateInstance(context) as GrassCoverErosionOutwardsWaveHeightLocationsView;
 
                 // Assert
                 Assert.AreSame(assessmentSection, view.AssessmentSection);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructureCollectionPropertyInfoTest.cs
===================================================================
diff -u -ra7f920661887773056c051edc7872d27f724c840 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructureCollectionPropertyInfoTest.cs	(.../HeightStructureCollectionPropertyInfoTest.cs)	(revision a7f920661887773056c051edc7872d27f724c840)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructureCollectionPropertyInfoTest.cs	(.../HeightStructureCollectionPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructuresFailureMechanismContextPropertyInfoTest.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructuresFailureMechanismContextPropertyInfoTest.cs	(.../HeightStructuresFailureMechanismContextPropertyInfoTest.cs)	(revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructuresFailureMechanismContextPropertyInfoTest.cs	(.../HeightStructuresFailureMechanismContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructuresInputContextPropertyInfoTest.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructuresInputContextPropertyInfoTest.cs	(.../HeightStructuresInputContextPropertyInfoTest.cs)	(revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/PropertyInfos/HeightStructuresInputContextPropertyInfoTest.cs	(.../HeightStructuresInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -308,7 +308,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -rdd0789232e8d39c64a6e89e0637f6848b02eae1e -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision dd0789232e8d39c64a6e89e0637f6848b02eae1e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsHydraulicBoundaryLocationsAsData()
+        public void CreateInstance_WithContext_SetsHydraulicBoundaryLocationsAsData()
         {
             // Setup
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionContextPropertyInfoTest.cs
===================================================================
diff -u -r43ad5cd168824e7ba3b7b772e94b570d12a0597e -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionContextPropertyInfoTest.cs	(.../FailureMechanismContributionContextPropertyInfoTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionContextPropertyInfoTest.cs	(.../FailureMechanismContributionContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -53,7 +53,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsFailureMechanismContributionAsData()
+        public void CreateInstance_WithContext_SetsFailureMechanismContributionAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/MacroStabilityOutwardsFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r65ce8c5ab171b234e33e2291998c9d89276db896 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/MacroStabilityOutwardsFailureMechanismPropertyInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismPropertyInfoTest.cs)	(revision 65ce8c5ab171b234e33e2291998c9d89276db896)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/MacroStabilityOutwardsFailureMechanismPropertyInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/PipingStructureFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r65ce8c5ab171b234e33e2291998c9d89276db896 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/PipingStructureFailureMechanismPropertyInfoTest.cs	(.../PipingStructureFailureMechanismPropertyInfoTest.cs)	(revision 65ce8c5ab171b234e33e2291998c9d89276db896)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/PipingStructureFailureMechanismPropertyInfoTest.cs	(.../PipingStructureFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r65ce8c5ab171b234e33e2291998c9d89276db896 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision 65ce8c5ab171b234e33e2291998c9d89276db896)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -rdd0789232e8d39c64a6e89e0637f6848b02eae1e -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs	(.../WaveHeightLocationsContextPropertyInfoTest.cs)	(revision dd0789232e8d39c64a6e89e0637f6848b02eae1e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs	(.../WaveHeightLocationsContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsHydraulicBoundaryLocationsAsData()
+        public void CreateInstance_WithContext_SetsHydraulicBoundaryLocationsAsData()
         {
             // Setup
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -rdd0789232e8d39c64a6e89e0637f6848b02eae1e -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision dd0789232e8d39c64a6e89e0637f6848b02eae1e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -127,7 +127,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetExpectedProperties()
+        public void CreateInstance_WithContext_SetExpectedProperties()
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -rdd0789232e8d39c64a6e89e0637f6848b02eae1e -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision dd0789232e8d39c64a6e89e0637f6848b02eae1e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -128,7 +128,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetExpectedProperties()
+        public void CreateInstance_WithContext_SetExpectedProperties()
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs
===================================================================
diff -u -rf3608ba821878cd5f6b9ddb99cfe6e23277f31f3 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs	(.../MacroStabilityInwardsCalculationActivity.cs)	(revision f3608ba821878cd5f6b9ddb99cfe6e23277f31f3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs	(.../MacroStabilityInwardsCalculationActivity.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -39,7 +39,7 @@
         /// Initializes a new instance of the <see cref="MacroStabilityInwardsCalculationActivity"/> class.
         /// </summary>
         /// <param name="calculation">The macro stability inwards data used for the calculation.</param>
-        /// <param name="normativeAssessmentLevel">The normative assessment level to use in case no manual assessment level is provided.</param>
+        /// <param name="normativeAssessmentLevel">The normative assessment level to use in case the manual assessment level is not applicable.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
         public MacroStabilityInwardsCalculationActivity(MacroStabilityInwardsCalculation calculation,
                                                         RoundedDouble normativeAssessmentLevel)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r8e062ef408ff5e32cf4545c50960055b69c51586 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsFailureMechanismPropertyInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismPropertyInfoTest.cs)	(revision 8e062ef408ff5e32cf4545c50960055b69c51586)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsFailureMechanismPropertyInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs
===================================================================
diff -u -rf1e2509586adc22fe33fbe2d4c2723d3de19ed7e -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs	(.../MacroStabilityInwardsInputContextPropertyInfoTest.cs)	(revision f1e2509586adc22fe33fbe2d4c2723d3de19ed7e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs	(.../MacroStabilityInwardsInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -54,7 +54,7 @@
 
         [TestCase(NormType.Signaling)]
         [TestCase(NormType.LowerLimit)]
-        public void CreateInstance_Always_ExpectedProperties(NormType normType)
+        public void CreateInstance_WithContext_ExpectedProperties(NormType normType)
         {
             // Setup
             const double designWaterLevelSignaling = 1.1;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextPropertyInfoTest.cs
===================================================================
diff -u -rc85b5e367887a96d602dfb7a0b46073b6eef84da -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextPropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextPropertyInfoTest.cs)	(revision c85b5e367887a96d602dfb7a0b46073b6eef84da)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextPropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithInputContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs
===================================================================
diff -u -rc4392a12110e2bb3549c5fee1ec319c229b67198 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs)	(revision c4392a12110e2bb3549c5fee1ec319c229b67198)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -57,7 +57,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithInputContextAsData()
         {
             // Setup
             MacroStabilityInwardsStochasticSoilModel context =
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsSurfaceLineCollectionContextPropertyInfoTest.cs
===================================================================
diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsSurfaceLineCollectionContextPropertyInfoTest.cs	(.../MacroStabilityInwardsSurfaceLineCollectionContextPropertyInfoTest.cs)	(revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsSurfaceLineCollectionContextPropertyInfoTest.cs	(.../MacroStabilityInwardsSurfaceLineCollectionContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithInputContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r5b421f80047c5b98776fb1c6f4a216775066e805 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs)	(revision 5b421f80047c5b98776fb1c6f4a216775066e805)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -323,7 +323,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -refaa2edd50840c91789e601b19d523377641c824 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs	(.../MacroStabilityInwardsScenariosViewInfoTest.cs)	(revision efaa2edd50840c91789e601b19d523377641c824)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs	(.../MacroStabilityInwardsScenariosViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -313,7 +313,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -rb9e7df65b2b31d7b0c9faf17926dde1efbbf4cb4 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingFailureMechanismPropertyInfoTest.cs	(.../PipingFailureMechanismPropertyInfoTest.cs)	(revision b9e7df65b2b31d7b0c9faf17926dde1efbbf4cb4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingFailureMechanismPropertyInfoTest.cs	(.../PipingFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingInputContextPropertyInfoTest.cs
===================================================================
diff -u -rf1e2509586adc22fe33fbe2d4c2723d3de19ed7e -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingInputContextPropertyInfoTest.cs	(.../PipingInputContextPropertyInfoTest.cs)	(revision f1e2509586adc22fe33fbe2d4c2723d3de19ed7e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingInputContextPropertyInfoTest.cs	(.../PipingInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -62,7 +62,7 @@
 
         [TestCase(NormType.Signaling)]
         [TestCase(NormType.LowerLimit)]
-        public void CreateInstance_Always_ExpectedProperties(NormType normType)
+        public void CreateInstance_WithContext_ExpectedProperties(NormType normType)
         {
             // Setup
             const double designWaterLevelSignaling = 1.1;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilModelCollectionContextPropertyInfoTest.cs
===================================================================
diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilModelCollectionContextPropertyInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextPropertyInfoTest.cs)	(revision 09693d79085118c47709b7059ab7c1ef459ad2aa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilModelCollectionContextPropertyInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithInputContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilModelPropertyInfoTest.cs
===================================================================
diff -u -r57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilModelPropertyInfoTest.cs	(.../PipingStochasticSoilModelPropertyInfoTest.cs)	(revision 57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilModelPropertyInfoTest.cs	(.../PipingStochasticSoilModelPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -57,7 +57,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputAsData()
+        public void CreateInstance_WithStochasticSoilModel_NewPropertiesWithInputAsData()
         {
             // Setup
             PipingStochasticSoilModel stochasticSoilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilProfilePropertyInfoTest.cs
===================================================================
diff -u -r6cf604a94300560817de70fd42d09baa5b22c3a6 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilProfilePropertyInfoTest.cs	(.../PipingStochasticSoilProfilePropertyInfoTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilProfilePropertyInfoTest.cs	(.../PipingStochasticSoilProfilePropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -57,7 +57,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputAsData()
+        public void CreateInstance_WithStochasticSoilProfile_NewPropertiesWithInputAsData()
         {
             // Setup
             var stochasticSoilProfile = new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingSurfaceLineCollectionContextPropertyInfoTest.cs
===================================================================
diff -u -raa49537188229065df91b1a931f088c32115702a -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingSurfaceLineCollectionContextPropertyInfoTest.cs	(.../PipingSurfaceLineCollectionContextPropertyInfoTest.cs)	(revision aa49537188229065df91b1a931f088c32115702a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingSurfaceLineCollectionContextPropertyInfoTest.cs	(.../PipingSurfaceLineCollectionContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithInputContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithInputContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r3bcc8993307e3b6dea8f496d6acbc9c474581787 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 3bcc8993307e3b6dea8f496d6acbc9c474581787)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -321,7 +321,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs
===================================================================
diff -u -refaa2edd50840c91789e601b19d523377641c824 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs	(.../PipingScenariosViewInfoTest.cs)	(revision efaa2edd50840c91789e601b19d523377641c824)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs	(.../PipingScenariosViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -315,7 +315,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructureCollectionPropertyInfoTest.cs
===================================================================
diff -u -r5ca67bdbaab0f6a9fb7682c06140b93bb0f5b5bb -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructureCollectionPropertyInfoTest.cs	(.../StabilityPointStructureCollectionPropertyInfoTest.cs)	(revision 5ca67bdbaab0f6a9fb7682c06140b93bb0f5b5bb)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructureCollectionPropertyInfoTest.cs	(.../StabilityPointStructureCollectionPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresFailureMechanismContextPropertyInfoTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresFailureMechanismContextPropertyInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextPropertyInfoTest.cs)	(revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresFailureMechanismContextPropertyInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresInputContextPropertyInfoTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresInputContextPropertyInfoTest.cs	(.../StabilityPointStructuresInputContextPropertyInfoTest.cs)	(revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresInputContextPropertyInfoTest.cs	(.../StabilityPointStructuresInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -60,7 +60,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_NewPropertiesWithFailureMechanismContextAsData()
+        public void CreateInstance_WithContext_NewPropertiesWithFailureMechanismContextAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs
===================================================================
diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs	(.../StabilityPointStructuresResultViewInfoTest.cs)	(revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs	(.../StabilityPointStructuresResultViewInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -317,7 +317,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_ReturnsView()
+        public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsFailureMechanismAsData()
+        public void CreateInstance_WithContext_SetsFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverWaveConditionsInputContextPropertyInfoTest.cs
===================================================================
diff -u -r026939d282e7281edebc62e49794d9648e574382 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverWaveConditionsInputContextPropertyInfoTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertyInfoTest.cs)	(revision 026939d282e7281edebc62e49794d9648e574382)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverWaveConditionsInputContextPropertyInfoTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -52,7 +52,7 @@
 
         [TestCase(NormType.Signaling)]
         [TestCase(NormType.LowerLimit)]
-        public void CreateInstance_Always_ExpectedProperties(NormType normType)
+        public void CreateInstance_WithContext_ExpectedProperties(NormType normType)
         {
             // Setup
             const double designWaterLevelSignaling = 1.1;
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void CreateInstance_Always_SetsFailureMechanismAsData()
+        public void CreateInstance_WithContext_SetsFailureMechanismAsData()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs
===================================================================
diff -u -r026939d282e7281edebc62e49794d9648e574382 -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs)	(revision 026939d282e7281edebc62e49794d9648e574382)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
@@ -52,7 +52,7 @@
 
         [TestCase(NormType.Signaling)]
         [TestCase(NormType.LowerLimit)]
-        public void CreateInstance_Always_ExpectedProperties(NormType normType)
+        public void CreateInstance_WithContext_ExpectedProperties(NormType normType)
         {
             // Setup
             const double designWaterLevelSignaling = 1.1;