Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -ra65bc56647a666fad39e7fe48fbce3a5c040dfee -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -59,11 +59,9 @@
     <Compile Include="DbContext\DikeAssessmentSectionEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\PartialDikeAssessmentSectionEntity.cs" />
     <Compile Include="DbContext\DuneAssessmentSectionEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\PartialDuneAssessmentSectionEntity.cs" />
     <Compile Include="DbContext\ProjectEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneAssessmentSectionEntity.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneAssessmentSectionEntity.cs	(.../DuneAssessmentSectionEntity.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneAssessmentSectionEntity.cs	(.../DuneAssessmentSectionEntity.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -39,7 +39,7 @@
         public long ProjectEntityId { get; set; }
         public string Name { get; set; }
         public int Norm { get; set; }
-        public long Order { get; set; }
+        public int Order { get; set; }
     
         public virtual ProjectEntity ProjectEntity { get; set; }
     }
Fisheye: Tag d180f991b1e2664695dc4e98118e3159256fe3cd refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialDikeAssessmentSectionEntity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d180f991b1e2664695dc4e98118e3159256fe3cd refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialDuneAssessmentSectionEntity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -23,7 +23,7 @@
           <Property Name="ProjectEntityId" Type="integer" Nullable="false" />
           <Property Name="Name" Type="varchar" MaxLength="260" Nullable="false" />
           <Property Name="Norm" Type="int" Nullable="false" />
-          <Property Name="Order" Type="integer" Nullable="false" />
+          <Property Name="Order" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="ProjectEntity">
           <Key>
@@ -88,11 +88,11 @@
           <EntitySet Name="Versions" EntityType="RingtoetsEntitiesModel.Version" />
           <EntitySet Name="ProjectEntities" EntityType="RingtoetsEntitiesModel.ProjectEntity" />
           <EntitySet Name="DikeAssessmentSectionEntities" EntityType="RingtoetsEntitiesModel.DikeAssessmentSectionEntity" />
-          <EntitySet Name="DuneAssessmentSectionEntities" EntityType="RingtoetsEntitiesModel.DuneAssessmentSectionEntity" />
           <AssociationSet Name="FK_DikeAssessmentSectionEntity_0_0" Association="RingtoetsEntitiesModel.FK_DikeAssessmentSectionEntity_0_0">
             <End Role="ProjectEntity" EntitySet="ProjectEntities" />
             <End Role="DikeAssessmentSectionEntity" EntitySet="DikeAssessmentSectionEntities" />
           </AssociationSet>
+          <EntitySet Name="DuneAssessmentSectionEntities" EntityType="RingtoetsEntitiesModel.DuneAssessmentSectionEntity" />
           <AssociationSet Name="FK_DuneAssessmentSectionEntity_0_0" Association="RingtoetsEntitiesModel.FK_DuneAssessmentSectionEntity_0_0">
             <End Role="ProjectEntity" EntitySet="ProjectEntities" />
             <End Role="DuneAssessmentSectionEntity" EntitySet="DuneAssessmentSectionEntities" />
@@ -128,17 +128,6 @@
           <Property Name="Order" Type="Int32" Nullable="false" />
           <NavigationProperty Name="ProjectEntity" Relationship="RingtoetsEntitiesModel.FK_DikeAssessmentSectionEntity_0_0" FromRole="DikeAssessmentSectionEntity" ToRole="ProjectEntity" />
         </EntityType>
-        <EntityType Name="DuneAssessmentSectionEntity">
-          <Key>
-            <PropertyRef Name="DuneAssessmentSectionEntityId" />
-          </Key>
-          <Property Name="DuneAssessmentSectionEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="ProjectEntityId" Type="Int64" Nullable="false" />
-          <Property Name="Name" Type="String" Nullable="false" MaxLength="260" FixedLength="false" Unicode="false" />
-          <Property Name="Norm" Type="Int32" Nullable="false" />
-          <Property Name="Order" Type="Int64" Nullable="false" />
-          <NavigationProperty Name="ProjectEntity" Relationship="RingtoetsEntitiesModel.FK_DuneAssessmentSectionEntity_0_0" FromRole="DuneAssessmentSectionEntity" ToRole="ProjectEntity" />
-        </EntityType>
         <Association Name="FK_DikeAssessmentSectionEntity_0_0">
           <End Type="RingtoetsEntitiesModel.ProjectEntity" Role="ProjectEntity" Multiplicity="1" />
           <End Type="RingtoetsEntitiesModel.DikeAssessmentSectionEntity" Role="DikeAssessmentSectionEntity" Multiplicity="*" />
@@ -151,6 +140,17 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <EntityType Name="DuneAssessmentSectionEntity">
+          <Key>
+            <PropertyRef Name="DuneAssessmentSectionEntityId" />
+          </Key>
+          <Property Name="DuneAssessmentSectionEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="ProjectEntityId" Type="Int64" Nullable="false" />
+          <Property Name="Name" Type="String" Nullable="false" MaxLength="260" FixedLength="false" Unicode="false" />
+          <Property Name="Norm" Type="Int32" Nullable="false" />
+          <Property Name="Order" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="ProjectEntity" Relationship="RingtoetsEntitiesModel.FK_DuneAssessmentSectionEntity_0_0" FromRole="DuneAssessmentSectionEntity" ToRole="ProjectEntity" />
+        </EntityType>
         <Association Name="FK_DuneAssessmentSectionEntity_0_0">
           <End Type="RingtoetsEntitiesModel.ProjectEntity" Role="ProjectEntity" Multiplicity="1" />
           <End Type="RingtoetsEntitiesModel.DuneAssessmentSectionEntity" Role="DuneAssessmentSectionEntity" Multiplicity="*" />
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -8,8 +8,8 @@
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.Version" Width="1.5" PointX="0.75" PointY="3.75" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.ProjectEntity" Width="1.5" PointX="3.375" PointY="2.625" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.DikeAssessmentSectionEntity" Width="1.5" PointX="5.625" PointY="1.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneAssessmentSectionEntity" Width="1.5" PointX="5.625" PointY="4" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_DikeAssessmentSectionEntity_0_0" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneAssessmentSectionEntity" Width="1.5" PointX="5.625" PointY="4.5" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_DuneAssessmentSectionEntity_0_0" />
         </Diagram>
     </edmx:Diagrams>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs	(.../DikeAssessmentSectionEntityPersistor.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs	(.../DikeAssessmentSectionEntityPersistor.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -59,24 +59,13 @@
         }
 
         /// <summary>
-        /// Loads the <see cref="DikeAssessmentSectionEntity"/> as <see cref="DikeAssessmentSection"/> from <paramref name="parentNavigationProperty"/>.
+        /// Loads the <see cref="DikeAssessmentSectionEntity"/> as <see cref="DikeAssessmentSection"/>.
         /// </summary>
-        /// <param name="parentNavigationProperty">Collection where <see cref="DikeAssessmentSectionEntity"/> objects can be searched. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
-        /// <returns>List of <see cref="DikeAssessmentSection"/>.</returns>
-        public IEnumerable<DikeAssessmentSection> LoadModels(ICollection<DikeAssessmentSectionEntity> parentNavigationProperty)
+        /// <param name="entity">The <see cref="DikeAssessmentSectionEntity"/> to load.</param>
+        /// <returns>A new instance of <see cref="DikeAssessmentSection"/>, based on the properties of <paramref name="entity"/>.</returns>
+        public DikeAssessmentSection LoadModel(DikeAssessmentSectionEntity entity)
         {
-            if (parentNavigationProperty == null)
-            {
-                throw new ArgumentNullException("parentNavigationProperty");
-            }
-            var list = new List<DikeAssessmentSection>();
-            var entities = parentNavigationProperty.ToList();
-            entities.Sort();
-            foreach (var entity in entities)
-            {
-                list.Add(converter.ConvertEntityToModel(entity));
-            }
-            return list;
+            return converter.ConvertEntityToModel(entity);
         }
 
         /// <summary>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DuneAssessmentSectionEntityPersistor.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DuneAssessmentSectionEntityPersistor.cs	(.../DuneAssessmentSectionEntityPersistor.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DuneAssessmentSectionEntityPersistor.cs	(.../DuneAssessmentSectionEntityPersistor.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -59,24 +59,13 @@
         }
 
         /// <summary>
-        /// Loads the <see cref="DuneAssessmentSectionEntity"/> as <see cref="DuneAssessmentSection"/> from <paramref name="parentNavigationProperty"/>.
+        /// Loads the <see cref="DuneAssessmentSectionEntity"/> as <see cref="DuneAssessmentSection"/>.
         /// </summary>
-        /// <param name="parentNavigationProperty">Collection where <see cref="DuneAssessmentSectionEntity"/> objects can be searched. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
-        /// <returns>List of <see cref="DuneAssessmentSection"/>.</returns>
-        public IEnumerable<DuneAssessmentSection> LoadModels(ICollection<DuneAssessmentSectionEntity> parentNavigationProperty)
+        /// <param name="entity">The <see cref="DuneAssessmentSectionEntity"/> to load.</param>
+        /// <returns>A new instance of <see cref="DuneAssessmentSection"/>, based on the properties of <paramref name="entity"/>.</returns>
+        public DuneAssessmentSection LoadModel(DuneAssessmentSectionEntity entity)
         {
-            if (parentNavigationProperty == null)
-            {
-                throw new ArgumentNullException("parentNavigationProperty");
-            }
-            var list = new List<DuneAssessmentSection>();
-            var entities = parentNavigationProperty.ToList();
-            entities.Sort();
-            foreach (var entity in entities)
-            {
-                list.Add(converter.ConvertEntityToModel(entity));
-            }
-            return list;
+            return converter.ConvertEntityToModel(entity);
         }
 
         /// <summary>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/IPersistor.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/IPersistor.cs	(.../IPersistor.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/IPersistor.cs	(.../IPersistor.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -61,11 +61,11 @@
         void PerformPostSaveActions();
 
         /// <summary>
-        /// Loads the <see cref="TEntity"/> as <see cref="TModel"/> from <paramref name="parentNavigationProperty"/>.
+        /// Loads the <see cref="TEntity"/> as <see cref="TModel"/>.
         /// </summary>
-        /// <param name="parentNavigationProperty">Collection where <see cref="TEntity"/> objects can be searched. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
-        /// <returns>List of <see cref="TModel"/>.</returns>
-        IEnumerable<TModel> LoadModels(ICollection<TEntity> parentNavigationProperty);
+        /// <param name="entity">The <see cref="TEntity"/> to load.</param>
+        /// <returns>A new instance of <see cref="TModel"/>, based on the properties of <paramref name="entity"/>.</returns>
+        TModel LoadModel(TEntity entity);
 
         /// <summary>
         /// Updates the children of <paramref name="model"/>, in reference to <paramref name="entity"/>, in the storage.
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs	(.../ProjectEntityPersistor.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs	(.../ProjectEntityPersistor.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -80,23 +80,28 @@
                 return null;
             }
             var project = converter.ConvertEntityToModel(entry);
-            if (entry.DikeAssessmentSectionEntities.Count > 0)
+
+            var nrOfItems = (entry.DikeAssessmentSectionEntities.Count + entry.DuneAssessmentSectionEntities.Count);
+            var assessmentSections = new object[nrOfItems];
+
+            var dikeAssessmentSectionEntities = entry.DikeAssessmentSectionEntities.ToList();
+            foreach (var sectionEntity in dikeAssessmentSectionEntities)
             {
-                var list = dikeAssessmentSectionEntityPersistor.LoadModels(entry.DikeAssessmentSectionEntities);
-                foreach (var section in list)
-                {
-                    project.Items.Add(section);
-                }
+                assessmentSections[sectionEntity.Order] = dikeAssessmentSectionEntityPersistor.LoadModel(sectionEntity);
             }
-            if (entry.DuneAssessmentSectionEntities.Count > 0)
+
+            var duneAssessmentSectionEntities = entry.DuneAssessmentSectionEntities.ToList();
+            foreach (var sectionEntity in duneAssessmentSectionEntities)
             {
-                var duneList = duneAssessmentSectionEntityPersistor.LoadModels(entry.DuneAssessmentSectionEntities);
-                foreach (var section in duneList)
-                {
-                    project.Items.Add(section);
-                }
+                assessmentSections[sectionEntity.Order] = duneAssessmentSectionEntityPersistor.LoadModel(sectionEntity);
             }
 
+            // Add to items sorted 
+            foreach (var assessmentSection in assessmentSections)
+            {
+                project.Items.Add(assessmentSection);
+            }
+
             return project;
         }
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/DikeAssessmentSectionEntityPersistorTest.cs
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/DikeAssessmentSectionEntityPersistorTest.cs	(.../DikeAssessmentSectionEntityPersistorTest.cs)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/DikeAssessmentSectionEntityPersistorTest.cs	(.../DikeAssessmentSectionEntityPersistorTest.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -47,15 +47,15 @@
         }
 
         [Test]
-        public void LoadModels_NullDataset_ThrowsArgumentNullException()
+        public void LoadModel_NullEntity_ThrowsArgumentNullException()
         {
             // Setup
             var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
             DikeAssessmentSectionEntityPersistor persistor = new DikeAssessmentSectionEntityPersistor(ringtoetsEntities);
             mockRepository.ReplayAll();
 
             // Call
-            TestDelegate test = () => persistor.LoadModels(null);
+            TestDelegate test = () => persistor.LoadModel(null);
 
             // Assert
             Assert.Throws<ArgumentNullException>(test);
@@ -64,48 +64,24 @@
         }
 
         [Test]
-        public void LoadModels_EmptyDataset_DoesNotThrowException()
+        public void LoadModel_ValidEntity_EntityAsModelInList()
         {
             // Setup
-            var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
-            DikeAssessmentSectionEntityPersistor persistor = new DikeAssessmentSectionEntityPersistor(ringtoetsEntities);
-            ICollection<DikeAssessmentSectionEntity> parentNavigationProperty = new List<DikeAssessmentSectionEntity>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate test = () => persistor.LoadModels(parentNavigationProperty);
-
-            // Assert
-            Assert.DoesNotThrow(test);
-
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void LoadModels_SingleEntityInDataset_EntityAsModelInList()
-        {
-            // Setup
             const long storageId = 1234L;
             const string name = "test";
             const int norm = 30000;
             var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
             DikeAssessmentSectionEntityPersistor persistor = new DikeAssessmentSectionEntityPersistor(ringtoetsEntities);
-            ICollection<DikeAssessmentSectionEntity> parentNavigationProperty = new List<DikeAssessmentSectionEntity>
+            var entity = new DikeAssessmentSectionEntity
             {
-                new DikeAssessmentSectionEntity
-                {
-                    DikeAssessmentSectionEntityId = storageId, Name = name, Norm = norm
-                }
+                DikeAssessmentSectionEntityId = storageId, Name = name, Norm = norm
             };
             mockRepository.ReplayAll();
 
             // Call
-            IEnumerable<DikeAssessmentSection> loadedModels = persistor.LoadModels(parentNavigationProperty);
+            DikeAssessmentSection section = persistor.LoadModel(entity);
 
             // Assert
-            var loadedModelsList = loadedModels.ToList();
-            Assert.AreEqual(parentNavigationProperty.Count, loadedModelsList.Count);
-            DikeAssessmentSection section = loadedModelsList[0];
             Assert.AreEqual(storageId, section.StorageId);
             Assert.AreEqual(name, section.Name);
             Assert.AreEqual(norm, section.FailureMechanismContribution.Norm);
@@ -114,7 +90,7 @@
         }
 
         [Test]
-        public void LoadModels_MultipleEntitiesInDataset_EntitiesAsModelInList()
+        public void LoadModel_MultipleEntitiesInDataset_EntitiesAsModelInList()
         {
             // Setup
             var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
@@ -133,7 +109,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            IEnumerable<DikeAssessmentSection> loadedModels = persistor.LoadModels(parentNavigationProperty);
+            var loadedModels = parentNavigationProperty.Select(entity => persistor.LoadModel(entity));
 
             // Assert
             var parentNavigationPropertyList = parentNavigationProperty.ToList();
@@ -669,7 +645,7 @@
                 {
                     persistor.UpdateModel(parentNavigationPropertyMock, dikeAssessmentSection, 0);
                 }
-                catch (Exception exception)
+                catch (Exception)
                 {
                     Assert.Fail("Precondition failed: persistor.UpdateModel");
                 }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/DuneAssessmentSectionEntityPersistorTest.cs
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/DuneAssessmentSectionEntityPersistorTest.cs	(.../DuneAssessmentSectionEntityPersistorTest.cs)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/DuneAssessmentSectionEntityPersistorTest.cs	(.../DuneAssessmentSectionEntityPersistorTest.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -47,15 +47,15 @@
         }
 
         [Test]
-        public void LoadModels_NullDataset_ThrowsArgumentNullException()
+        public void LoadModel_NullEntity_ThrowsArgumentNullException()
         {
             // Setup
             var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
             DuneAssessmentSectionEntityPersistor persistor = new DuneAssessmentSectionEntityPersistor(ringtoetsEntities);
             mockRepository.ReplayAll();
 
             // Call
-            TestDelegate test = () => persistor.LoadModels(null);
+            TestDelegate test = () => persistor.LoadModel(null);
 
             // Assert
             Assert.Throws<ArgumentNullException>(test);
@@ -64,48 +64,26 @@
         }
 
         [Test]
-        public void LoadModels_EmptyDataset_DoesNotThrowException()
+        public void LoadModel_ValidEntity_EntityAsModelInList()
         {
             // Setup
-            var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
-            DuneAssessmentSectionEntityPersistor persistor = new DuneAssessmentSectionEntityPersistor(ringtoetsEntities);
-            ICollection<DuneAssessmentSectionEntity> parentNavigationProperty = new List<DuneAssessmentSectionEntity>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate test = () => persistor.LoadModels(parentNavigationProperty);
-
-            // Assert
-            Assert.DoesNotThrow(test);
-
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void LoadModels_SingleEntityInDataset_EntityAsModelInList()
-        {
-            // Setup
             const long storageId = 1234L;
             const string name = "test";
             const int norm = 30000;
             var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
             DuneAssessmentSectionEntityPersistor persistor = new DuneAssessmentSectionEntityPersistor(ringtoetsEntities);
-            ICollection<DuneAssessmentSectionEntity> parentNavigationProperty = new List<DuneAssessmentSectionEntity>
+            var entity = new DuneAssessmentSectionEntity
             {
-                new DuneAssessmentSectionEntity
-                {
-                    DuneAssessmentSectionEntityId = storageId, Name = name, Norm = norm
-                }
+                DuneAssessmentSectionEntityId = storageId,
+                Name = name,
+                Norm = norm
             };
             mockRepository.ReplayAll();
 
             // Call
-            IEnumerable<DuneAssessmentSection> loadedModels = persistor.LoadModels(parentNavigationProperty);
+            DuneAssessmentSection section = persistor.LoadModel(entity);
 
             // Assert
-            var loadedModelsList = loadedModels.ToList();
-            Assert.AreEqual(parentNavigationProperty.Count, loadedModelsList.Count);
-            DuneAssessmentSection section = loadedModelsList[0];
             Assert.AreEqual(storageId, section.StorageId);
             Assert.AreEqual(name, section.Name);
             Assert.AreEqual(norm, section.FailureMechanismContribution.Norm);
@@ -114,7 +92,7 @@
         }
 
         [Test]
-        public void LoadModels_MultipleEntitiesInDataset_EntitiesAsModelInList()
+        public void LoadModel_MultipleEntitiesInDataset_EntitiesAsModelInList()
         {
             // Setup
             var ringtoetsEntities = mockRepository.StrictMock<IRingtoetsEntities>();
@@ -133,7 +111,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            IEnumerable<DuneAssessmentSection> loadedModels = persistor.LoadModels(parentNavigationProperty);
+            var loadedModels = parentNavigationProperty.Select(entity => persistor.LoadModel(entity));
 
             // Assert
             var parentNavigationPropertyList = parentNavigationProperty.ToList();
@@ -312,7 +290,8 @@
                 {
                     Norm = norm
                 }
-            };
+            }
+                ;
             mockRepository.ReplayAll();
 
             // Call
@@ -659,7 +638,7 @@
                 {
                     persistor.UpdateModel(parentNavigationPropertyMock, duneAssessmentSection, 0);
                 }
-                catch (Exception exception)
+                catch (Exception)
                 {
                     Assert.Fail("Precondition failed: persistor.UpdateModel");
                 }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -rd180f991b1e2664695dc4e98118e3159256fe3cd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs	(.../ProjectEntityPersistorTest.cs)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs	(.../ProjectEntityPersistorTest.cs)	(revision d180f991b1e2664695dc4e98118e3159256fe3cd)
@@ -174,14 +174,16 @@
                     {
                         new DikeAssessmentSectionEntity
                         {
-                            Norm = 1
+                            Norm = 1,
+                            Order = 0
                         }
                     },
                     DuneAssessmentSectionEntities = new List<DuneAssessmentSectionEntity>
                     {
                         new DuneAssessmentSectionEntity
                         {
-                            Norm = 1
+                            Norm = 1,
+                            Order = 1
                         }
                     }
                 }
@@ -199,8 +201,8 @@
             Assert.AreEqual(storageId, model.StorageId);
             Assert.AreEqual(description, model.Description);
             Assert.AreEqual(2, model.Items.Count);
-            Assert.AreEqual(1, model.Items.OfType<DikeAssessmentSection>().ToList().Count);
-            Assert.AreEqual(1, model.Items.OfType<DuneAssessmentSection>().ToList().Count);
+            Assert.AreEqual(1, model.Items.Count(i => i is DikeAssessmentSection));
+            Assert.AreEqual(1, model.Items.Count(i => i is DuneAssessmentSection));
 
             mockRepository.VerifyAll();
         }