Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs
===================================================================
diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e2995c33111d0a613b7d1a43d2a2d6410da87b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs	(.../DesignWaterLevelCalculationsViewInfoTest.cs)	(revision 886b86a66f072735567285a3489923186c236c32)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs	(.../DesignWaterLevelCalculationsViewInfoTest.cs)	(revision 0e2995c33111d0a613b7d1a43d2a2d6410da87b7)
@@ -304,7 +304,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    new AssessmentSectionStub(),
                                                                    getNormFunc,
-                                                                   categoryBoundaryName))
+                                                                   () => categoryBoundaryName))
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -331,7 +331,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSection,
                                                                    () => 0.01,
-                                                                   "A"))
+                                                                   () => "A"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -354,7 +354,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSectionA,
                                                                    () => 0.01,
-                                                                   "A"))
+                                                                   () => "A"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -376,7 +376,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSectionA,
                                                                    () => 0.01,
-                                                                   "A"))
+                                                                   () => "A"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r958c44f070f86bf30625f7ecff8eafb1e51f9a90 -r0e2995c33111d0a613b7d1a43d2a2d6410da87b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs)	(revision 958c44f070f86bf30625f7ecff8eafb1e51f9a90)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs)	(revision 0e2995c33111d0a613b7d1a43d2a2d6410da87b7)
@@ -287,16 +287,14 @@
             var assessmentSection = new AssessmentSectionStub();
             var calculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
 
-            const string categoryBoundaryName = "A";
-
             var context = new WaterLevelCalculationsForNormTargetProbabilityContext(calculations,
                                                                                     assessmentSection,
                                                                                     GetNormFunc);
 
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    new AssessmentSectionStub(),
                                                                    GetNormFunc,
-                                                                   categoryBoundaryName))
+                                                                   () => "1/100"))
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -323,7 +321,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSection,
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -346,7 +344,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSectionA,
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -368,7 +366,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSectionA,
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r8ed5614b7eaddc3cc4b42b9bab875ef50cc9feeb -r0e2995c33111d0a613b7d1a43d2a2d6410da87b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 8ed5614b7eaddc3cc4b42b9bab875ef50cc9feeb)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 0e2995c33111d0a613b7d1a43d2a2d6410da87b7)
@@ -295,7 +295,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    new AssessmentSectionStub(),
                                                                    () => targetProbability,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -324,7 +324,7 @@
             using (var view = new DesignWaterLevelCalculationsView(context.WrappedData.HydraulicBoundaryLocationCalculations,
                                                                    new AssessmentSectionStub(),
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 view.Data = context.WrappedData.HydraulicBoundaryLocationCalculations;
@@ -352,7 +352,7 @@
             using (var view = new DesignWaterLevelCalculationsView(otherCalculations,
                                                                    new AssessmentSectionStub(),
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 view.Data = otherCalculations;
@@ -376,7 +376,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSection,
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -399,7 +399,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSectionA,
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -421,7 +421,7 @@
             using (var view = new DesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                    assessmentSectionA,
                                                                    () => 0.01,
-                                                                   "1/100"))
+                                                                   () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);