Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestStructure.cs
===================================================================
diff -u -rd32eef17c3a48ff9b0cfce71088e912b1b5bb8c0 -r9ff0a37a156186137dbaf5a4d43bc0fab10de1f0
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestStructure.cs	(.../TestStructure.cs)	(revision d32eef17c3a48ff9b0cfce71088e912b1b5bb8c0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestStructure.cs	(.../TestStructure.cs)	(revision 9ff0a37a156186137dbaf5a4d43bc0fab10de1f0)
@@ -33,17 +33,60 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestStructure"/>.
         /// </summary>
-        public TestStructure() : this("name", "id", new Point2D(0.0, 0.0)) {}
+        public TestStructure() 
+            : this("id") {}
 
         /// <summary>
         /// Creates a new instance of <see cref="TestStructure"/>.
         /// </summary>
+        /// <param name="id">The id of the structure.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="id"/>
+        /// is <c>null</c>, empty or consists of whitespace.</exception>
+        public TestStructure(string id) 
+            : this(id, "name") {}
+
+        /// <summary>
+        /// Creates a new instance of <see cref="TestStructure"/>.
+        /// </summary>
+        /// <param name="id">The id of the structure.</param>
+        /// <param name="name">The name of the structure.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="id"/> or 
+        /// <paramref name="name"/> is <c>null</c>, empty or consists of only whitespaces.</exception>
+        public TestStructure(string id, string name)
+            : this(id, name, new Point2D(0.0, 0.0)) { }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="TestStructure"/>.
+        /// </summary>
+        /// <param name="id">The id of the structure.</param>
         /// <param name="location">The location of the structure.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="id"/> is 
+        /// <c>null</c>, empty or consists of only whitespaces.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="location"/>
         /// is <c>null</c>.</exception>
-        public TestStructure(Point2D location) : this("name", "id", location) {}
+        public TestStructure(string id, Point2D location)
+            : this(id, "name", location) { }
 
-        private TestStructure(string name, string id, Point2D location)
+        /// <summary>
+        /// Creates a new instance of <see cref="TestStructure"/>.
+        /// </summary>
+        /// <param name="location">The location of the structure.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="location"/>
+        /// is <c>null</c>.</exception>
+        public TestStructure(Point2D location) 
+            : this("id", "name", location) {}
+
+        /// <summary>
+        /// Creates a new instance of <see cref="TestStructure"/>.
+        /// </summary>
+        /// <param name="id">The id of the structure.</param>
+        /// <param name="name">The name of the structure.</param>
+        /// <param name="location">The location of the structure.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="id"/> or 
+        /// <paramref name="name"/> is <c>null</c>, empty or consists of only whitespaces.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="location"/>
+        /// is <c>null</c>.</exception>
+        public TestStructure(string id, string name, Point2D location)
             : base(new ConstructionProperties
             {
                 Name = name,