Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rc6f21599d10c85adba65b4e50985b17ba1b44a22
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision c6f21599d10c85adba65b4e50985b17ba1b44a22)
@@ -30,6 +30,7 @@
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HeightStructures.Data;
+using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityStoneCover.Data;
@@ -235,6 +236,94 @@
         }
 
         [Test]
+        public void Create_GroupWithMacroStabilityInwardsCalculations_CreatesEntities()
+        {
+            // Setup
+            var group = new CalculationGroup("root", true)
+            {
+                Children =
+                {
+                    new MacroStabilityInwardsCalculationScenario
+                    {
+                        Name = "A"
+                    },
+                    new MacroStabilityInwardsCalculationScenario
+                    {
+                        Name = "B"
+                    }
+                }
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            CalculationGroupEntity entity = group.Create(registry, 0);
+
+            // Assert
+            MacroStabilityInwardsCalculationEntity[] childCalculationEntities = entity.MacroStabilityInwardsCalculationEntities.ToArray();
+            Assert.AreEqual(2, childCalculationEntities.Length);
+
+            MacroStabilityInwardsCalculationEntity childEntity1 = childCalculationEntities[0];
+            Assert.AreEqual("A", childEntity1.Name);
+            Assert.AreEqual(0, childEntity1.Order);
+
+            MacroStabilityInwardsCalculationEntity childEntity2 = childCalculationEntities[1];
+            Assert.AreEqual("B", childEntity2.Name);
+            Assert.AreEqual(1, childEntity2.Order);
+        }
+
+        [Test]
+        public void Create_GroupWithChildMacroStabilityInwardsCalculationsAndChildCalculationGroups_CreateEntities()
+        {
+            // Setup
+            var group = new CalculationGroup("root", true)
+            {
+                Children =
+                {
+                    new CalculationGroup("A", true),
+                    new MacroStabilityInwardsCalculationScenario
+                    {
+                        Name = "B"
+                    },
+                    new CalculationGroup("C", true),
+                    new MacroStabilityInwardsCalculationScenario
+                    {
+                        Name = "D"
+                    }
+                }
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            CalculationGroupEntity entity = group.Create(registry, 0);
+
+            // Assert
+            CalculationGroupEntity[] childGroupEntities = entity.CalculationGroupEntity1.ToArray();
+            MacroStabilityInwardsCalculationEntity[] childCalculationEntities = entity.MacroStabilityInwardsCalculationEntities.ToArray();
+            Assert.AreEqual(2, childGroupEntities.Length);
+            Assert.AreEqual(2, childCalculationEntities.Length);
+
+            CalculationGroupEntity childEntity1 = childGroupEntities[0];
+            Assert.AreEqual("A", childEntity1.Name);
+            Assert.AreEqual(0, childEntity1.Order);
+            CollectionAssert.IsEmpty(childEntity1.CalculationGroupEntity1);
+
+            MacroStabilityInwardsCalculationEntity childEntity2 = childCalculationEntities[0];
+            Assert.AreEqual("B", childEntity2.Name);
+            Assert.AreEqual(1, childEntity2.Order);
+
+            CalculationGroupEntity childEntity3 = childGroupEntities[1];
+            Assert.AreEqual("C", childEntity3.Name);
+            Assert.AreEqual(2, childEntity3.Order);
+            CollectionAssert.IsEmpty(childEntity3.CalculationGroupEntity1);
+
+            MacroStabilityInwardsCalculationEntity childEntity4 = childCalculationEntities[1];
+            Assert.AreEqual("D", childEntity4.Name);
+            Assert.AreEqual(3, childEntity4.Order);
+        }
+
+        [Test]
         public void Create_GroupWithChildGrassCoverErosionInwardsCalculations_CreateEntities()
         {
             // Setup