Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -r1811626955b35ce3019b250013b92a56f00a561a -rd83bc80d11262310f469ccc3032ffc534af61789
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs	(.../CalculationTreeNodeInfoFactoryTest.cs)	(revision 1811626955b35ce3019b250013b92a56f00a561a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs	(.../CalculationTreeNodeInfoFactoryTest.cs)	(revision d83bc80d11262310f469ccc3032ffc534af61789)
@@ -87,7 +87,7 @@
         }
 
         [Test]
-        public void CanRenameNodeOfCalculationGroupContextTreeNodeInfo_ParentIsCalculationGroupContext_ReturnTrue()
+        public void CanRenameNodeOfCalculationGroupContextTreeNodeInfo_NestedCalculationGroup_ReturnTrue()
         {
             // Setup
             var mocks = new MockRepository();
@@ -108,7 +108,7 @@
         }
 
         [Test]
-        public void CanRenameNodeOfCalculationGroupContextTreeNodeInfo_EverythingElse_ReturnFalse()
+        public void CanRenameNodeOfCalculationGroupContextTreeNodeInfo_WithoutParentNodeDefaultBehavior_ReturnFalse()
         {
             // Setup
             var treeNodeInfo = CalculationTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<TestCalculationGroupContext>(null, null, null);
@@ -149,16 +149,34 @@
         }
 
         [Test]
-        public void CanRemoveOfCalculationGroupContextTreeNodeInfo_CalculationGroupWithoutParent_ReturnFalse()
+        public void CanRemoveOfCalculationGroupContextTreeNodeInfo_NestedCalculationGroup_ReturnTrue()
         {
             // Setup
             var mocks = new MockRepository();
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
             mocks.ReplayAll();
 
-            var group = new CalculationGroup();
-            var nodeData = new TestCalculationGroupContext(group, failureMechanismMock);
+            var nodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
+            var parentNodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
+            var treeNodeInfo = CalculationTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<TestCalculationGroupContext>(null, null, null);
 
+            // Call
+            bool isRemovalAllowed = treeNodeInfo.CanRemove(nodeData, parentNodeData);
+
+            // Assert
+            Assert.IsTrue(isRemovalAllowed);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanRemoveOfCalculationGroupContextTreeNodeInfo_WithoutParentNodeDefaultBehavior_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
+            mocks.ReplayAll();
+
+            var nodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
             var treeNodeInfo = CalculationTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<TestCalculationGroupContext>(null, null, null);
 
             // Call
@@ -170,24 +188,42 @@
         }
 
         [Test]
-        public void CanRemoveOfCalculationGroupContextTreeNodeInfo_NestedCalculationGroup_ReturnTrue()
+        public void CanDragOfCalculationGroupContextTreeNodeInfo_NestedCalculationGroup_ReturnTrue()
         {
             // Setup
             var mocks = new MockRepository();
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
+
             mocks.ReplayAll();
 
-            var nodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
-            var parentNodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
+            var groupContext = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
+            var parentGroupContext = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
+            var treeNodeInfo = CalculationTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<TestCalculationGroupContext>(null, null, null);
 
+            // Call
+            var canDrag = treeNodeInfo.CanDrag(groupContext, parentGroupContext);
+
+            // Assert
+            Assert.IsTrue(canDrag);
+        }
+
+        [Test]
+        public void CanDragOfCalculationGroupContextTreeNodeInfo_WithoutParentNodeDefaultBehavior_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
+
+            mocks.ReplayAll();
+
+            var groupContext = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock);
             var treeNodeInfo = CalculationTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<TestCalculationGroupContext>(null, null, null);
 
             // Call
-            bool isRemovalAllowed = treeNodeInfo.CanRemove(nodeData, parentNodeData);
+            var canDrag = treeNodeInfo.CanDrag(groupContext, null);
 
             // Assert
-            Assert.IsTrue(isRemovalAllowed);
-            mocks.VerifyAll();
+            Assert.IsFalse(canDrag);
         }
 
         private class TestCalculationGroupContext : Observable, ICalculationContext<CalculationGroup, IFailureMechanism>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1811626955b35ce3019b250013b92a56f00a561a -rd83bc80d11262310f469ccc3032ffc534af61789
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 1811626955b35ce3019b250013b92a56f00a561a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision d83bc80d11262310f469ccc3032ffc534af61789)
@@ -480,52 +480,6 @@
         }
 
         [Test]
-        public void CanDrag_WithoutParentNodeDefaultBehavior_ReturnFalse()
-        {
-            // Setup
-            var group = new CalculationGroup();
-            var failureMechanismMock = mocks.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(group,
-                                                                                   failureMechanismMock,
-                                                                                   assessmentSectionMock);
-
-            // Call
-            var canDrag = info.CanDrag(groupContext, null);
-
-            // Assert
-            Assert.IsFalse(canDrag);
-        }
-
-        [Test]
-        public void CanDrag_ParentIsGrassCoverErosionInwardsCalculationGroupContext_ReturnTrue()
-        {
-            // Setup
-            var group = new CalculationGroup();
-            var parentGroup = new CalculationGroup();
-            var failureMechanismMock = mocks.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-
-            mocks.ReplayAll();
-
-            var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(group,
-                                                                                   failureMechanismMock,
-                                                                                   assessmentSectionMock);
-
-            var parentGroupContext = new GrassCoverErosionInwardsCalculationGroupContext(parentGroup,
-                                                                                         failureMechanismMock,
-                                                                                         assessmentSectionMock);
-
-            // Call
-            var canDrag = info.CanDrag(groupContext, parentGroupContext);
-
-            // Assert
-            Assert.IsTrue(canDrag);
-        }
-
-        [Test]
         [Combinatorial]
         public void CanDropOrCanInsert_DraggingPipingCalculationItemContextOntoGroupNotContainingItem_ReturnTrue(
             [Values(DragDropTestMethod.CanDrop, DragDropTestMethod.CanInsert)] DragDropTestMethod methodToTest,
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1811626955b35ce3019b250013b92a56f00a561a -rd83bc80d11262310f469ccc3032ffc534af61789
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 1811626955b35ce3019b250013b92a56f00a561a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision d83bc80d11262310f469ccc3032ffc534af61789)
@@ -1357,58 +1357,6 @@
         }
 
         [Test]
-        public void CanDrag_WithoutParentNodeDefaultBehavior_ReturnFalse()
-        {
-            // Setup
-            var group = new CalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var groupContext = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<StochasticSoilModel>(),
-                                                                 pipingFailureMechanismMock,
-                                                                 assessmentSectionMock);
-
-            // Call
-            var canDrag = info.CanDrag(groupContext, null);
-
-            // Assert
-            Assert.IsFalse(canDrag);
-        }
-
-        [Test]
-        public void CanDrag_ParentIsPipingCalculationGroupContext_ReturnTrue()
-        {
-            // Setup
-            var group = new CalculationGroup();
-            var parentGroup = new CalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-
-            mocks.ReplayAll();
-
-            var groupContext = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<StochasticSoilModel>(),
-                                                                 pipingFailureMechanismMock,
-                                                                 assessmentSectionMock);
-
-            var parentGroupContext = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                       Enumerable.Empty<StochasticSoilModel>(),
-                                                                       pipingFailureMechanismMock,
-                                                                       assessmentSectionMock);
-
-            // Call
-            var canDrag = info.CanDrag(groupContext, parentGroupContext);
-
-            // Assert
-            Assert.IsTrue(canDrag);
-        }
-
-        [Test]
         [Combinatorial]
         public void CanDropOrCanInsert_DraggingPipingCalculationItemContextOntoGroupNotContainingItem_ReturnTrue(
             [Values(DragDropTestMethod.CanDrop, DragDropTestMethod.CanInsert)] DragDropTestMethod methodToTest,