Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableCombinedFailureMechanismSectionAssembliesTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableCombinedFailureMechanismSectionAssembliesTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableCombinedFailureMechanismSectionAssembliesTest.cs	(revision d165baa19c1759f26a4c8c0c3a314bb75f3a9efe)
@@ -0,0 +1,94 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.IO.Model;
+using Ringtoets.Integration.IO.AggregatedSerializable;
+
+namespace Ringtoets.Integration.IO.Test.AggregatedSerializable
+{
+    [TestFixture]
+    public class AggregatedSerializableCombinedFailureMechanismSectionAssembliesTest
+    {
+        [Test]
+        public void Constructor_FailureMechanismSectionCollectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new AggregatedSerializableCombinedFailureMechanismSectionAssemblies(null,
+                                                                                                          Enumerable.Empty<SerializableFailureMechanismSection>(),
+                                                                                                          Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSectionCollection", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_FailureMechanismSectionsNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new AggregatedSerializableCombinedFailureMechanismSectionAssemblies(new SerializableFailureMechanismSectionCollection(),
+                                                                                                          null,
+                                                                                                          Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSections", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_CombinedFailureMechanismSectionAssembliesNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new AggregatedSerializableCombinedFailureMechanismSectionAssemblies(new SerializableFailureMechanismSectionCollection(),
+                                                                                                          Enumerable.Empty<SerializableFailureMechanismSection>(),
+                                                                                                          null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("combinedFailureMechanismSectionAssemblies", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WithValidArguments_ExpectedValues()
+        {
+            // Setup
+            var failureMechanismSectionCollection = new SerializableFailureMechanismSectionCollection();
+            IEnumerable<SerializableFailureMechanismSection> failureMechanismSections =
+                Enumerable.Empty<SerializableFailureMechanismSection>();
+            IEnumerable<SerializableCombinedFailureMechanismSectionAssembly> failureMechanismSectionAssemblies =
+                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>();
+
+            // Call
+            var aggregate = new AggregatedSerializableCombinedFailureMechanismSectionAssemblies(failureMechanismSectionCollection,
+                                                                                                failureMechanismSections,
+                                                                                                failureMechanismSectionAssemblies);
+
+            // Assert
+            Assert.AreSame(failureMechanismSectionCollection, aggregate.FailureMechanismSectionCollection);
+            Assert.AreSame(failureMechanismSections, aggregate.FailureMechanismSections);
+            Assert.AreSame(failureMechanismSectionAssemblies, aggregate.CombinedFailureMechanismSectionAssemblies);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableCombinedFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableCombinedFailureMechanismSectionAssemblyTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableCombinedFailureMechanismSectionAssemblyTest.cs	(revision d165baa19c1759f26a4c8c0c3a314bb75f3a9efe)
@@ -0,0 +1,72 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.IO.Model;
+using Ringtoets.Integration.IO.AggregatedSerializable;
+
+namespace Ringtoets.Integration.IO.Test.AggregatedSerializable
+{
+    [TestFixture]
+    public class AggregatedSerializableCombinedFailureMechanismSectionAssemblyTest
+    {
+        [Test]
+        public void Constructor_FailureMechanismSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new AggregatedSerializableCombinedFailureMechanismSectionAssembly(null,
+                                                                                                        new SerializableCombinedFailureMechanismSectionAssembly());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSection", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_CombinedFailureMechanismSectionAssemblyNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new AggregatedSerializableCombinedFailureMechanismSectionAssembly(new SerializableFailureMechanismSection(),
+                                                                                                        null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("combinedFailureMechanismSectionAssembly", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WithValidArguments_ExpectedValues()
+        {
+            // Setup
+            var failureMechanismSection = new SerializableFailureMechanismSection();
+            var sectionAssemblyResult = new SerializableCombinedFailureMechanismSectionAssembly();
+
+            // Call
+            var aggregate =
+                new AggregatedSerializableCombinedFailureMechanismSectionAssembly(failureMechanismSection, sectionAssemblyResult);
+
+            // Assert
+            Assert.AreSame(failureMechanismSection, aggregate.FailureMechanismSection);
+            Assert.AreSame(sectionAssemblyResult, aggregate.CombinedFailureMechanismSectionAssembly);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableFailureMechanismSectionAssemblyTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableFailureMechanismSectionAssemblyTest.cs	(revision d165baa19c1759f26a4c8c0c3a314bb75f3a9efe)
@@ -0,0 +1,72 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.IO.Model;
+using Ringtoets.Integration.IO.AggregatedSerializable;
+
+namespace Ringtoets.Integration.IO.Test.AggregatedSerializable
+{
+    [TestFixture]
+    public class AggregatedSerializableFailureMechanismSectionAssemblyTest
+    {
+        [Test]
+        public void Constructor_FailureMechanismSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () =>
+                new AggregatedSerializableFailureMechanismSectionAssembly(null, new SerializableFailureMechanismSectionAssembly());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSection", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_FailureMechanismSectionAssemblyResultNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () =>
+                new AggregatedSerializableFailureMechanismSectionAssembly(new SerializableFailureMechanismSection(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSectionAssembly", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WithValidArguments_ExpectedValues()
+        {
+            // Setup
+            var section = new SerializableFailureMechanismSection();
+            var sectionAssemblyResult = new SerializableFailureMechanismSectionAssembly();
+
+            // Call
+            var aggregatedResult =
+                new AggregatedSerializableFailureMechanismSectionAssembly(section, sectionAssemblyResult);
+
+            // Assert
+            Assert.AreSame(section, aggregatedResult.FailureMechanismSection);
+            Assert.AreSame(sectionAssemblyResult, aggregatedResult.FailureMechanismSectionAssembly);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableFailureMechanismTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableFailureMechanismTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializable/AggregatedSerializableFailureMechanismTest.cs	(revision d165baa19c1759f26a4c8c0c3a314bb75f3a9efe)
@@ -0,0 +1,140 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.IO.Model;
+using Ringtoets.Integration.IO.AggregatedSerializable;
+
+namespace Ringtoets.Integration.IO.Test.AggregatedSerializable
+{
+    [TestFixture]
+    public class AggregatedSerializableFailureMechanismTest
+    {
+        [Test]
+        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var failureMechanismSectionCollection = new SerializableFailureMechanismSectionCollection();
+            IEnumerable<SerializableFailureMechanismSection> failureMechanismSections =
+                Enumerable.Empty<SerializableFailureMechanismSection>();
+            IEnumerable<SerializableFailureMechanismSectionAssembly> failureMechanismSectionAssemblyResults =
+                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>();
+
+            // Call
+            TestDelegate call = () => new AggregatedSerializableFailureMechanism(null,
+                                                                                 failureMechanismSectionCollection,
+                                                                                 failureMechanismSections,
+                                                                                 failureMechanismSectionAssemblyResults);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_FailureMechanismSectionCollectionNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var failureMechanism = new SerializableFailureMechanism();
+            IEnumerable<SerializableFailureMechanismSection> failureMechanismSections =
+                Enumerable.Empty<SerializableFailureMechanismSection>();
+            IEnumerable<SerializableFailureMechanismSectionAssembly> failureMechanismSectionAssemblyResults =
+                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>();
+
+            // Call
+            TestDelegate call = () => new AggregatedSerializableFailureMechanism(failureMechanism,
+                                                                                 null,
+                                                                                 failureMechanismSections,
+                                                                                 failureMechanismSectionAssemblyResults);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSectionCollection", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_FailureMechanismSectionsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var failureMechanism = new SerializableFailureMechanism();
+            var failureMechanismSectionCollection = new SerializableFailureMechanismSectionCollection();
+            IEnumerable<SerializableFailureMechanismSectionAssembly> failureMechanismSectionAssemblyResults =
+                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>();
+
+            // Call
+            TestDelegate call = () => new AggregatedSerializableFailureMechanism(failureMechanism,
+                                                                                 failureMechanismSectionCollection,
+                                                                                 null,
+                                                                                 failureMechanismSectionAssemblyResults);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSections", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_FailureMechanismSectionAssemblyResultsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var failureMechanism = new SerializableFailureMechanism();
+            var failureMechanismSectionCollection = new SerializableFailureMechanismSectionCollection();
+            IEnumerable<SerializableFailureMechanismSection> failureMechanismSections =
+                Enumerable.Empty<SerializableFailureMechanismSection>();
+
+            // Call
+            TestDelegate call = () => new AggregatedSerializableFailureMechanism(failureMechanism,
+                                                                                 failureMechanismSectionCollection,
+                                                                                 failureMechanismSections,
+                                                                                 null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanismSectionAssemblyResults", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WithValidArguments_ExpectedValues()
+        {
+            // Setup
+            var failureMechanism = new SerializableFailureMechanism();
+            var failureMechanismSectionCollection = new SerializableFailureMechanismSectionCollection();
+            IEnumerable<SerializableFailureMechanismSection> failureMechanismSections =
+                Enumerable.Empty<SerializableFailureMechanismSection>();
+            IEnumerable<SerializableFailureMechanismSectionAssembly> failureMechanismSectionAssemblyResults =
+                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>();
+
+            // Call
+            var aggregatedFailureMechanism = new AggregatedSerializableFailureMechanism(failureMechanism,
+                                                                                        failureMechanismSectionCollection,
+                                                                                        failureMechanismSections,
+                                                                                        failureMechanismSectionAssemblyResults);
+
+            // Assert
+            Assert.AreSame(failureMechanism, aggregatedFailureMechanism.FailureMechanism);
+            Assert.AreSame(failureMechanismSectionCollection, aggregatedFailureMechanism.FailureMechanismSectionCollection);
+            Assert.AreSame(failureMechanismSections, aggregatedFailureMechanism.FailureMechanismSections);
+            Assert.AreSame(failureMechanismSectionAssemblyResults, aggregatedFailureMechanism.FailureMechanismSectionAssemblyResults);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag d165baa19c1759f26a4c8c0c3a314bb75f3a9efe refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializableCombinedFailureMechanismSectionAssembliesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d165baa19c1759f26a4c8c0c3a314bb75f3a9efe refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializableCombinedFailureMechanismSectionAssemblyTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d165baa19c1759f26a4c8c0c3a314bb75f3a9efe refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializableFailureMechanismSectionAssemblyTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d165baa19c1759f26a4c8c0c3a314bb75f3a9efe refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/AggregatedSerializableFailureMechanismTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj
===================================================================
diff -u -rde21b4a394f7973e3937dc194ec15dc7ff53c856 -rd165baa19c1759f26a4c8c0c3a314bb75f3a9efe
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj	(.../Ringtoets.Integration.IO.Test.csproj)	(revision de21b4a394f7973e3937dc194ec15dc7ff53c856)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj	(.../Ringtoets.Integration.IO.Test.csproj)	(revision d165baa19c1759f26a4c8c0c3a314bb75f3a9efe)
@@ -17,10 +17,10 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AggregatedSerializableCombinedFailureMechanismSectionAssembliesTest.cs" />
-    <Compile Include="AggregatedSerializableCombinedFailureMechanismSectionAssemblyTest.cs" />
-    <Compile Include="AggregatedSerializableFailureMechanismSectionAssemblyTest.cs" />
-    <Compile Include="AggregatedSerializableFailureMechanismTest.cs" />
+    <Compile Include="AggregatedSerializable\AggregatedSerializableCombinedFailureMechanismSectionAssembliesTest.cs" />
+    <Compile Include="AggregatedSerializable\AggregatedSerializableCombinedFailureMechanismSectionAssemblyTest.cs" />
+    <Compile Include="AggregatedSerializable\AggregatedSerializableFailureMechanismSectionAssemblyTest.cs" />
+    <Compile Include="AggregatedSerializable\AggregatedSerializableFailureMechanismTest.cs" />
     <Compile Include="Assembly\ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs" />
     <Compile Include="Assembly\ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs" />
     <Compile Include="Assembly\ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs" />