Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca3449dbec4170e0321aa3f0612a26419e70d6ec -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs	(.../DikeProfilesContextTreeNodeInfoTest.cs)	(revision ca3449dbec4170e0321aa3f0612a26419e70d6ec)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs	(.../DikeProfilesContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -61,11 +61,12 @@
             // Assert
             Assert.AreEqual(typeof(DikeProfilesContext), info.TagType);
             Assert.IsNotNull(info.Text);
-            Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ForeColor);
-            Assert.IsNotNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<GrassCoverErosionInwardsFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -81,19 +81,20 @@
             // Assert
             Assert.AreEqual(typeof(GrassCoverErosionInwardsCalculationContext), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNotNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNotNull(info.ChildNodeObjects);
-            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNotNull(info.CanRename);
             Assert.IsNotNull(info.OnNodeRenamed);
             Assert.IsNotNull(info.CanRemove);
             Assert.IsNotNull(info.OnNodeRemoved);
-            Assert.IsNotNull(info.CanDrag);
-            Assert.IsNull(info.ForeColor);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNotNull(info.CanDrag);
             Assert.IsNull(info.CanDrop);
             Assert.IsNull(info.CanInsert);
             Assert.IsNull(info.OnDrop);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -97,22 +97,23 @@
             // Assert
             Assert.AreEqual(typeof(GrassCoverErosionInwardsCalculationGroupContext), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNotNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNotNull(info.ChildNodeObjects);
-            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNotNull(info.CanRename);
             Assert.IsNotNull(info.OnNodeRenamed);
             Assert.IsNotNull(info.CanRemove);
             Assert.IsNotNull(info.OnNodeRemoved);
-            Assert.IsNotNull(info.CanDrag);
-            Assert.IsNotNull(info.CanInsert);
-            Assert.IsNotNull(info.CanDrop);
-            Assert.IsNotNull(info.OnDrop);
-            Assert.IsNull(info.ForeColor);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNotNull(info.CanDrag);
+            Assert.IsNotNull(info.CanDrop);
+            Assert.IsNotNull(info.CanInsert);
+            Assert.IsNotNull(info.OnDrop);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -82,9 +82,10 @@
             Assert.IsNotNull(info.Text);
             Assert.IsNotNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
-            Assert.IsNotNull(info.ChildNodeObjects);
             Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -64,10 +64,11 @@
             // Assert
             Assert.AreEqual(typeof(GrassCoverErosionInwardsInputContext), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
-            Assert.IsNull(info.ForeColor);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -62,10 +62,11 @@
             // Assert
             Assert.AreEqual(typeof(GrassCoverErosionInwardsOutput), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
-            Assert.IsNull(info.ForeColor);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -59,11 +59,12 @@
             // Assert
             Assert.AreEqual(typeof(GrassCoverErosionInwardsScenariosContext), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
-            Assert.IsNull(info.ForeColor);
-            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r96c1ccdc59027cef75d66c29a1724d0652576bd5 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 96c1ccdc59027cef75d66c29a1724d0652576bd5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -67,8 +67,17 @@
 
                 // Assert
                 Assert.AreEqual(typeof(AssessmentSection), info.TagType);
+                Assert.IsNotNull(info.Text);
                 Assert.IsNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
+                Assert.IsNotNull(info.EnsureVisibleOnCreate);
                 Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNotNull(info.ChildNodeObjects);
+                Assert.IsNotNull(info.CanRename);
+                Assert.IsNotNull(info.OnNodeRenamed);
+                Assert.IsNotNull(info.CanRemove);
+                Assert.IsNotNull(info.OnNodeRemoved);
                 Assert.IsNull(info.CanCheck);
                 Assert.IsNull(info.IsChecked);
                 Assert.IsNull(info.OnNodeChecked);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs
===================================================================
diff -u -rad4f4fc96186eb88fdc790b03f43bbf960c80eeb -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs	(.../CategoryTreeFolderTreeNodeInfoTest.cs)	(revision ad4f4fc96186eb88fdc790b03f43bbf960c80eeb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs	(.../CategoryTreeFolderTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -54,7 +54,13 @@
 
                 // Assert
                 Assert.AreEqual(typeof(CategoryTreeFolder), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNotNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
                 Assert.IsNull(info.OnNodeRenamed);
                 Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -55,7 +55,12 @@
 
                 // Assert
                 Assert.AreEqual(typeof(Comment), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
                 Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
                 Assert.IsNull(info.OnNodeRenamed);
@@ -68,7 +73,6 @@
                 Assert.IsNull(info.CanDrop);
                 Assert.IsNull(info.CanInsert);
                 Assert.IsNull(info.OnDrop);
-                Assert.IsNull(info.ForeColor);
             }
             mocks.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -68,19 +68,24 @@
 
                 // Assert
                 Assert.AreEqual(typeof(DesignWaterLevelLocationsContext), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNotNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
+                Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNull(info.ChildNodeObjects);
+                Assert.IsNull(info.CanRename);
+                Assert.IsNull(info.OnNodeRenamed);
+                Assert.IsNull(info.CanRemove);
+                Assert.IsNull(info.OnNodeRemoved);
                 Assert.IsNull(info.CanCheck);
                 Assert.IsNull(info.IsChecked);
                 Assert.IsNull(info.OnNodeChecked);
                 Assert.IsNull(info.CanDrag);
                 Assert.IsNull(info.CanDrop);
                 Assert.IsNull(info.CanInsert);
                 Assert.IsNull(info.OnDrop);
-                Assert.IsNull(info.EnsureVisibleOnCreate);
-                Assert.IsNull(info.ChildNodeObjects);
-                Assert.IsNull(info.CanRename);
-                Assert.IsNull(info.OnNodeRenamed);
-                Assert.IsNull(info.CanRemove);
-                Assert.IsNull(info.OnNodeRemoved);
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DikeProfileTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DikeProfileTreeNodeInfoTest.cs	(.../DikeProfileTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DikeProfileTreeNodeInfoTest.cs	(.../DikeProfileTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -64,13 +64,16 @@
             // Assert
             Assert.AreEqual(typeof(DikeProfile), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
-            Assert.IsNull(info.ForeColor);
-            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNotNull(info.CanRemove);
+            Assert.IsNotNull(info.OnNodeRemoved);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -52,6 +52,31 @@
         }
 
         [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(EmptyProbabilityAssessmentOutput), info.TagType);
+            Assert.IsNotNull(info.Text);
+            Assert.IsNotNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.IsChecked);
+            Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNull(info.CanDrag);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
+        }
+
+        [Test]
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rad4f4fc96186eb88fdc790b03f43bbf960c80eeb -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision ad4f4fc96186eb88fdc790b03f43bbf960c80eeb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -73,7 +73,13 @@
 
                 // Assert
                 Assert.AreEqual(typeof(FailureMechanismContext<IFailureMechanism>), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNotNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNotNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
                 Assert.IsNull(info.OnNodeRenamed);
                 Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(.../FailureMechanismContributionContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(.../FailureMechanismContributionContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -57,8 +57,12 @@
 
                 // Assert
                 Assert.AreEqual(typeof(FailureMechanismContributionContext), info.TagType);
+                Assert.IsNotNull(info.Text);
                 Assert.IsNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
                 Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
                 Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionsContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionsContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -58,12 +58,17 @@
 
                 // Assert
                 Assert.AreEqual(typeof(FailureMechanismSectionsContext), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNotNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
                 Assert.IsNull(info.OnNodeRenamed);
                 Assert.IsNull(info.CanRemove);
                 Assert.IsNull(info.OnNodeRemoved);
-                Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanCheck);
                 Assert.IsNull(info.IsChecked);
                 Assert.IsNull(info.OnNodeChecked);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs
===================================================================
diff -u -rca3449dbec4170e0321aa3f0612a26419e70d6ec -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs	(.../ForeshoreProfileTreeNodeInfoTest.cs)	(revision ca3449dbec4170e0321aa3f0612a26419e70d6ec)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs	(.../ForeshoreProfileTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -70,13 +70,16 @@
             // Assert
             Assert.AreEqual(typeof(ForeshoreProfile), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
-            Assert.IsNull(info.ForeColor);
-            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNotNull(info.CanRemove);
+            Assert.IsNotNull(info.OnNodeRemoved);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfilesContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca3449dbec4170e0321aa3f0612a26419e70d6ec -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfilesContextTreeNodeInfoTest.cs	(.../ForeshoreProfilesContextTreeNodeInfoTest.cs)	(revision ca3449dbec4170e0321aa3f0612a26419e70d6ec)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfilesContextTreeNodeInfoTest.cs	(.../ForeshoreProfilesContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -61,18 +61,24 @@
         public void Initialized_ExpectedValues()
         {
             // Assert
+            Assert.IsNotNull(info.Text);
+            Assert.IsNotNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
             Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.IsChecked);
+            Assert.IsNull(info.OnNodeChecked);
             Assert.IsNull(info.CanDrag);
             Assert.IsNull(info.CanDrop);
             Assert.IsNull(info.CanInsert);
-            Assert.IsNull(info.CanRemove);
-            Assert.IsNull(info.CanRename);
-            Assert.IsNull(info.EnsureVisibleOnCreate);
-            Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnDrop);
-            Assert.IsNull(info.OnNodeChecked);
-            Assert.IsNull(info.OnNodeRemoved);
-            Assert.IsNull(info.OnNodeRenamed);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r20a3e0fe462e2afb58034a32ac56c063c7d9b5e2 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 20a3e0fe462e2afb58034a32ac56c063c7d9b5e2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -73,18 +73,24 @@
 
                 // Assert
                 Assert.AreEqual(typeof(HydraulicBoundaryDatabaseContext), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNotNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
+                Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNotNull(info.ChildNodeObjects);
+                Assert.IsNull(info.CanRename);
+                Assert.IsNull(info.OnNodeRenamed);
+                Assert.IsNull(info.CanRemove);
+                Assert.IsNull(info.OnNodeRemoved);
                 Assert.IsNull(info.CanCheck);
                 Assert.IsNull(info.IsChecked);
                 Assert.IsNull(info.OnNodeChecked);
                 Assert.IsNull(info.CanDrag);
                 Assert.IsNull(info.CanDrop);
                 Assert.IsNull(info.CanInsert);
                 Assert.IsNull(info.OnDrop);
-                Assert.IsNull(info.EnsureVisibleOnCreate);
-                Assert.IsNull(info.CanRename);
-                Assert.IsNull(info.OnNodeRemoved);
-                Assert.IsNull(info.CanRemove);
-                Assert.IsNull(info.OnNodeRemoved);
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<MacrostabilityInwardsFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<MacrostabilityOutwardsFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../ProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../ProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -62,10 +62,11 @@
             // Assert
             Assert.AreEqual(typeof(ProbabilityAssessmentOutput), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
-            Assert.IsNull(info.ForeColor);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs	(.../ReferenceLineContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs	(.../ReferenceLineContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -57,7 +57,12 @@
 
                 // Assert
                 Assert.AreEqual(typeof(ReferenceLineContext), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNotNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
                 Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
                 Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs
===================================================================
diff -u -rad4f4fc96186eb88fdc790b03f43bbf960c80eeb -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs	(.../RingtoetsProjectTreeNodeInfoTest.cs)	(revision ad4f4fc96186eb88fdc790b03f43bbf960c80eeb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs	(.../RingtoetsProjectTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -56,19 +56,24 @@
 
                 // Assert
                 Assert.AreEqual(typeof(RingtoetsProject), info.TagType);
+                Assert.IsNotNull(info.Text);
                 Assert.IsNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
+                Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNotNull(info.ChildNodeObjects);
+                Assert.IsNull(info.CanRename);
+                Assert.IsNull(info.OnNodeRenamed);
+                Assert.IsNull(info.CanRemove);
+                Assert.IsNull(info.OnNodeRemoved);
                 Assert.IsNull(info.CanCheck);
                 Assert.IsNull(info.IsChecked);
                 Assert.IsNull(info.OnNodeChecked);
                 Assert.IsNull(info.CanDrag);
                 Assert.IsNull(info.CanDrop);
                 Assert.IsNull(info.CanInsert);
                 Assert.IsNull(info.OnDrop);
-                Assert.IsNull(info.EnsureVisibleOnCreate);
-                Assert.IsNull(info.CanRename);
-                Assert.IsNull(info.OnNodeRenamed);
-                Assert.IsNull(info.CanRemove);
-                Assert.IsNull(info.OnNodeRemoved);
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<TechnicalInnovationFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,10 +63,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -69,19 +69,24 @@
 
                 // Assert
                 Assert.AreEqual(typeof(WaveHeightLocationsContext), info.TagType);
+                Assert.IsNotNull(info.Text);
+                Assert.IsNotNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
+                Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNull(info.ChildNodeObjects);
+                Assert.IsNull(info.CanRename);
+                Assert.IsNull(info.OnNodeRenamed);
+                Assert.IsNull(info.CanRemove);
+                Assert.IsNull(info.OnNodeRemoved);
                 Assert.IsNull(info.CanCheck);
                 Assert.IsNull(info.IsChecked);
                 Assert.IsNull(info.OnNodeChecked);
                 Assert.IsNull(info.CanDrag);
                 Assert.IsNull(info.CanDrop);
                 Assert.IsNull(info.CanInsert);
                 Assert.IsNull(info.OnDrop);
-                Assert.IsNull(info.EnsureVisibleOnCreate);
-                Assert.IsNull(info.ChildNodeObjects);
-                Assert.IsNull(info.CanRename);
-                Assert.IsNull(info.OnNodeRenamed);
-                Assert.IsNull(info.CanRemove);
-                Assert.IsNull(info.OnNodeRemoved);
             }
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs	(.../EmptyPipingOutputTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs	(.../EmptyPipingOutputTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -63,7 +63,12 @@
 
             // Assert
             Assert.AreEqual(typeof(EmptyPipingOutput), info.TagType);
+            Assert.IsNotNull(info.Text);
+            Assert.IsNotNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -62,10 +62,13 @@
 
             // Assert
             Assert.AreEqual(typeof(FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>), info.TagType);
-
-            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r508dd39d24aa726c9a9c9e0f21cbd11b9705291f -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 508dd39d24aa726c9a9c9e0f21cbd11b9705291f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -92,10 +92,24 @@
 
             // Assert
             Assert.AreEqual(typeof(PipingCalculationGroupContext), info.TagType);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNotNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.CanRename);
+            Assert.IsNotNull(info.OnNodeRenamed);
+            Assert.IsNotNull(info.CanRemove);
+            Assert.IsNotNull(info.OnNodeRemoved);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNotNull(info.CanDrag);
+            Assert.IsNotNull(info.CanDrop);
+            Assert.IsNotNull(info.CanInsert);
+            Assert.IsNotNull(info.OnDrop);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra3c988fd496fe9d11e875c483f25dc599a0fe4c0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision a3c988fd496fe9d11e875c483f25dc599a0fe4c0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -75,10 +75,21 @@
 
             // Assert
             Assert.AreEqual(typeof(PipingCalculationScenarioContext), info.TagType);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNotNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.CanRename);
+            Assert.IsNotNull(info.OnNodeRenamed);
+            Assert.IsNotNull(info.CanRemove);
+            Assert.IsNotNull(info.OnNodeRemoved);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNotNull(info.CanDrag);
             Assert.IsNull(info.CanDrop);
             Assert.IsNull(info.CanInsert);
             Assert.IsNull(info.OnDrop);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra3c988fd496fe9d11e875c483f25dc599a0fe4c0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision a3c988fd496fe9d11e875c483f25dc599a0fe4c0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -79,8 +79,13 @@
 
             // Assert
             Assert.AreEqual(typeof(PipingFailureMechanismContext), info.TagType);
+            Assert.IsNotNull(info.Text);
             Assert.IsNotNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs	(.../PipingInputContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs	(.../PipingInputContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -65,8 +65,12 @@
 
             // Assert
             Assert.AreEqual(typeof(PipingInputContext), info.TagType);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingOutputContextTreeNodeInfoTest.cs	(.../PipingOutputContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingOutputContextTreeNodeInfoTest.cs	(.../PipingOutputContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -61,8 +61,12 @@
 
             // Assert
             Assert.AreEqual(typeof(PipingOutputContext), info.TagType);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingScenariosContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingScenariosContextTreeNodeInfoTest.cs	(.../PipingScenariosContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingScenariosContextTreeNodeInfoTest.cs	(.../PipingScenariosContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -59,11 +59,12 @@
             // Assert
             Assert.AreEqual(typeof(PipingScenariosContext), info.TagType);
             Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
             Assert.IsNotNull(info.Image);
             Assert.IsNotNull(info.ContextMenuStrip);
-            Assert.IsNull(info.ForeColor);
-            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -rca3449dbec4170e0321aa3f0612a26419e70d6ec -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs)	(revision ca3449dbec4170e0321aa3f0612a26419e70d6ec)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -67,7 +67,13 @@
 
             // Assert
             Assert.AreEqual(typeof(RingtoetsPipingSurfaceLinesContext), info.TagType);
+            Assert.IsNotNull(info.Text);
+            Assert.IsNotNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -67,11 +67,17 @@
 
             // Assert
             Assert.AreEqual(typeof(RingtoetsPipingSurfaceLine), info.TagType);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNotNull(info.CanRemove);
+            Assert.IsNotNull(info.OnNodeRemoved);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs
===================================================================
diff -u -re4dc5a2f979cd2d810010b683969c20d30bce846 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision e4dc5a2f979cd2d810010b683969c20d30bce846)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -61,10 +61,17 @@
         {
             // Assert
             Assert.AreEqual(typeof(StochasticSoilModel), info.TagType);
-            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNotNull(info.CanRemove);
+            Assert.IsNotNull(info.OnNodeRemoved);
             Assert.IsNull(info.CanCheck);
             Assert.IsNull(info.IsChecked);
             Assert.IsNull(info.OnNodeChecked);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelsContextTreeNodeInfoTest.cs
===================================================================
diff -u -re4dc5a2f979cd2d810010b683969c20d30bce846 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelsContextTreeNodeInfoTest.cs	(.../StochasticSoilModelsContextTreeNodeInfoTest.cs)	(revision e4dc5a2f979cd2d810010b683969c20d30bce846)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelsContextTreeNodeInfoTest.cs	(.../StochasticSoilModelsContextTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -67,7 +67,13 @@
 
             // Assert
             Assert.AreEqual(typeof(StochasticSoilModelsContext), info.TagType);
+            Assert.IsNotNull(info.Text);
+            Assert.IsNotNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
             Assert.IsNull(info.CanRemove);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r516abd6e2142e4ea580b851f7e74dfc513357bde
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs	(.../StochasticSoilProfileTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs	(.../StochasticSoilProfileTreeNodeInfoTest.cs)	(revision 516abd6e2142e4ea580b851f7e74dfc513357bde)
@@ -62,8 +62,12 @@
 
             // Assert
             Assert.AreEqual(typeof(StochasticSoilProfile), info.TagType);
+            Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
             Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);