Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r4ffa129cfd21b2916606f3c82bdf3d68806e0278 -rde581b98583a4421a3e5f08bc003794f773d2439
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 4ffa129cfd21b2916606f3c82bdf3d68806e0278)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision de581b98583a4421a3e5f08bc003794f773d2439)
@@ -308,8 +308,7 @@
 
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
-            yield return new PropertyInfo<IAssessmentSection, AssessmentSectionProperties>();
-            yield return new PropertyInfo<StateRootContext, AssessmentSectionProperties>
+            yield return new PropertyInfo<AssessmentSectionStateRootContext, AssessmentSectionProperties>
             {
                 CreateInstance = context => new AssessmentSectionProperties(context.WrappedData)
             };
@@ -474,7 +473,10 @@
                                                                                  context.AssessmentSection,
                                                                                  context.GetNormFunc,
                                                                                  context.CategoryBoundaryName),
-                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
+                AfterCreate = (view, context) =>
+                {
+                    view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
+                }
             };
 
             yield return new ViewInfo<WaveHeightCalculationsContext, IObservableEnumerable<HydraulicBoundaryLocationCalculation>, WaveHeightCalculationsView>
@@ -488,7 +490,10 @@
                                                                            context.AssessmentSection,
                                                                            context.GetNormFunc,
                                                                            context.CategoryBoundaryName),
-                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
+                AfterCreate = (view, context) =>
+                {
+                    view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
+                }
             };
 
             yield return new ViewInfo<IAssessmentSection, AssessmentSectionView>
@@ -1734,7 +1739,10 @@
                 RiskeerCommonFormsResources.Calculate_All,
                 Resources.AssessmentSection_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
-                (sender, args) => { ActivityProgressDialogRunner.Run(Gui.MainWindow, AssessmentSectionCalculationActivityFactory.CreateActivities(nodeData)); });
+                (sender, args) =>
+                {
+                    ActivityProgressDialogRunner.Run(Gui.MainWindow, AssessmentSectionCalculationActivityFactory.CreateActivities(nodeData));
+                });
 
             var importItem = new StrictContextMenuItem(
                 CoreGuiResources.Import,
@@ -1871,7 +1879,10 @@
                 RiskeerCommonFormsResources.Calculate_All,
                 Resources.AssessmentSection_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
-                (sender, args) => { ActivityProgressDialogRunner.Run(Gui.MainWindow, AssessmentSectionCalculationActivityFactory.CreateActivities(nodeData.WrappedData)); });
+                (sender, args) =>
+                {
+                    ActivityProgressDialogRunner.Run(Gui.MainWindow, AssessmentSectionCalculationActivityFactory.CreateActivities(nodeData.WrappedData));
+                });
 
             return Gui.Get(nodeData, treeViewControl)
                       .AddOpenItem()
@@ -1887,13 +1898,12 @@
                       .Build();
         }
 
-
         #region FailurePathsStateRootContext TreeNodeInfo
 
         private static object[] FailurePathsStateRootContextChildNodeObjects(FailurePathsStateRootContext nodeData)
         {
             AssessmentSection assessmentSection = nodeData.WrappedData;
-            
+
             return new object[]
             {
                 new FailurePathsContext(assessmentSection),
@@ -1915,7 +1925,7 @@
                       .AddPropertiesItem()
                       .Build();
         }
-        
+
         #endregion
 
         #endregion
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/AssessmentSectionStateRootContextPropertyInfoTest.cs
===================================================================
diff -u -r761e768c3934a63eba9c7249c726a241473f6ce6 -rde581b98583a4421a3e5f08bc003794f773d2439
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/AssessmentSectionStateRootContextPropertyInfoTest.cs	(.../AssessmentSectionStateRootContextPropertyInfoTest.cs)	(revision 761e768c3934a63eba9c7249c726a241473f6ce6)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/AssessmentSectionStateRootContextPropertyInfoTest.cs	(.../AssessmentSectionStateRootContextPropertyInfoTest.cs)	(revision de581b98583a4421a3e5f08bc003794f773d2439)
@@ -85,8 +85,7 @@
 
         private static PropertyInfo GetInfo(RiskeerPlugin plugin)
         {
-            PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().Where(tni => tni.PropertyObjectType == typeof(AssessmentSectionProperties)).ToArray();
-            return propertyInfos[1];
+            return plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(AssessmentSectionProperties));
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r9984d2faad6ed47635c72787d94f9fce4ab20b2c -rde581b98583a4421a3e5f08bc003794f773d2439
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 9984d2faad6ed47635c72787d94f9fce4ab20b2c)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision de581b98583a4421a3e5f08bc003794f773d2439)
@@ -241,17 +241,12 @@
                 PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(28, propertyInfos.Length);
+                Assert.AreEqual(27, propertyInfos.Length);
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
-                    typeof(IAssessmentSection),
+                    typeof(AssessmentSectionStateRootContext),
                     typeof(AssessmentSectionProperties));
-                
-                PluginTestHelper.AssertPropertyInfoDefined(
-                    propertyInfos,
-                    typeof(StateRootContext),
-                    typeof(AssessmentSectionProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,