Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs	(.../TestClosingStructureTest.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs	(.../TestClosingStructureTest.cs)	(revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
@@ -36,6 +36,7 @@
             // Assert
             Assert.IsInstanceOf<ClosingStructure>(structure);
             Assert.AreEqual("test", structure.Name);
+            Assert.AreEqual("id", structure.Id);
             Assert.AreEqual(new Point2D(12345.56789, 9876.54321), structure.Location);
             Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType);
             AssertTestClosingStructureDefaults(structure);
@@ -53,12 +54,32 @@
             // Assert
             Assert.IsInstanceOf<ClosingStructure>(structure);
             Assert.AreEqual(name, structure.Name);
+            Assert.AreEqual("id", structure.Id);
             Assert.AreEqual(new Point2D(12345.56789, 9876.54321), structure.Location);
             Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType);
             AssertTestClosingStructureDefaults(structure);
         }
 
         [Test]
+        public void Constructor_WithStructureNameAndId_ExpectedValues()
+        {
+            // Setup
+            const string name = "<some name>";
+            const string id = "<some id";
+
+            // Call
+            var structure = new TestClosingStructure(name, id);
+
+            // Assert
+            Assert.IsInstanceOf<ClosingStructure>(structure);
+            Assert.AreEqual(name, structure.Name);
+            Assert.AreEqual(id, structure.Id);
+            Assert.AreEqual(new Point2D(12345.56789, 9876.54321), structure.Location);
+            Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType);
+            AssertTestClosingStructureDefaults(structure);
+        }
+
+        [Test]
         public void Constructor_WithLocation_ExpectedValues()
         {
             // Setup
@@ -70,6 +91,7 @@
             // Assert
             Assert.IsInstanceOf<ClosingStructure>(structure);
             Assert.AreEqual("test", structure.Name);
+            Assert.AreEqual("id", structure.Id);
             Assert.AreEqual(location, structure.Location);
             Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType);
             AssertTestClosingStructureDefaults(structure);
@@ -87,15 +109,14 @@
             // Assert
             Assert.IsInstanceOf<ClosingStructure>(structure);
             Assert.AreEqual("test", structure.Name);
+            Assert.AreEqual("id", structure.Id);
             Assert.AreEqual(new Point2D(12345.56789, 9876.54321), structure.Location);
             Assert.AreEqual(type, structure.InflowModelType);
             AssertTestClosingStructureDefaults(structure);
         }
 
         private static void AssertTestClosingStructureDefaults(ClosingStructure structure)
         {
-            Assert.AreEqual("id", structure.Id);
-
             Assert.AreEqual(10.0, structure.StructureNormalOrientation.Value);
 
             Assert.AreEqual(20000, structure.StorageStructureArea.Mean.Value);