Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/AdoptableFailureMechanismSectionResultEntityReadExtensions.cs
===================================================================
diff -u -re8a590f71b19fb8495d2ec5d007058fbb04484df -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/AdoptableFailureMechanismSectionResultEntityReadExtensions.cs	(.../AdoptableFailureMechanismSectionResultEntityReadExtensions.cs)	(revision e8a590f71b19fb8495d2ec5d007058fbb04484df)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/AdoptableFailureMechanismSectionResultEntityReadExtensions.cs	(.../AdoptableFailureMechanismSectionResultEntityReadExtensions.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -28,19 +28,19 @@
 {
     /// <summary>
     /// This class defines extension methods for read operations for an <see cref="AdoptableFailureMechanismSectionResult"/>
-    /// based on the <see cref="IAdoptableFailureMechanismSectionResultEntity"/>.
+    /// based on an <see cref="AdoptableFailureMechanismSectionResultEntity"/>.
     /// </summary>
     internal static class AdoptableFailureMechanismSectionResultEntityReadExtensions
     {
         /// <summary>
-        /// Reads the <see cref="IAdoptableFailureMechanismSectionResultEntity"/> and use the information
+        /// Reads the <see cref="AdoptableFailureMechanismSectionResultEntity"/> and use the information
         /// to update an <see cref="AdoptableFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="IAdoptableFailureMechanismSectionResultEntity"/> used to update 
+        /// <param name="entity">The <see cref="AdoptableFailureMechanismSectionResultEntity"/> used to update 
         /// the <paramref name="sectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        internal static void Read(this IAdoptableFailureMechanismSectionResultEntity entity,
+        internal static void Read(this AdoptableFailureMechanismSectionResultEntity entity,
                                   AdoptableFailureMechanismSectionResult sectionResult)
         {
             if (entity == null)
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs
===================================================================
diff -u -rdce1ae84f0269d30cddbeb502227db25d84e7f7a -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs	(.../AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs)	(revision dce1ae84f0269d30cddbeb502227db25d84e7f7a)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs	(.../AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -21,26 +21,27 @@
 
 using System;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Primitives;
 using Riskeer.Storage.Core.DbContext;
 
 namespace Riskeer.Storage.Core.Read.FailureMechanismSectionResults
 {
     /// <summary>
     /// This class defines extension methods for read operations for an
     /// <see cref="AdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
-    /// based on the <see cref="IAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/>.
+    /// based on an <see cref="AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/>.
     /// </summary>
     internal static class AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions
     {
         /// <summary>
-        /// Reads the <see cref="IAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> and use the information
+        /// Reads the <see cref="AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> and use the information
         /// to update an <see cref="AdoptableWithProfileProbabilityFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="IAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> used to update 
+        /// <param name="entity">The <see cref="AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> used to update 
         /// the <paramref name="sectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        internal static void Read(this IAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity entity,
+        internal static void Read(this AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity entity,
                                   AdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult)
         {
             if (entity == null)
@@ -53,7 +54,11 @@
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            ((IAdoptableFailureMechanismSectionResultEntity) entity).Read(sectionResult);
+            sectionResult.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
+            sectionResult.InitialFailureMechanismResultType = (AdoptableInitialFailureMechanismResultType) entity.InitialFailureMechanismResultType;
+            sectionResult.ManualInitialFailureMechanismResultSectionProbability = entity.ManualInitialFailureMechanismResultSectionProbability.ToNullAsNaN();
+            sectionResult.FurtherAnalysisType = (FailureMechanismSectionResultFurtherAnalysisType) entity.FurtherAnalysisType;
+            sectionResult.RefinedSectionProbability = entity.RefinedSectionProbability.ToNullAsNaN();
             sectionResult.ManualInitialFailureMechanismResultProfileProbability = entity.ManualInitialFailureMechanismResultProfileProbability.ToNullAsNaN();
             sectionResult.ProbabilityRefinementType = (ProbabilityRefinementType) entity.ProbabilityRefinementType;
             sectionResult.RefinedProfileProbability = entity.RefinedProfileProbability.ToNullAsNaN();
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/NonAdoptableFailureMechanismSectionResultEntityReadExtensions.cs
===================================================================
diff -u -re8a590f71b19fb8495d2ec5d007058fbb04484df -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/NonAdoptableFailureMechanismSectionResultEntityReadExtensions.cs	(.../NonAdoptableFailureMechanismSectionResultEntityReadExtensions.cs)	(revision e8a590f71b19fb8495d2ec5d007058fbb04484df)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/NonAdoptableFailureMechanismSectionResultEntityReadExtensions.cs	(.../NonAdoptableFailureMechanismSectionResultEntityReadExtensions.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -28,19 +28,19 @@
 {
     /// <summary>
     /// This class defines extension methods for read operations for a <see cref="NonAdoptableFailureMechanismSectionResult"/>
-    /// based on the <see cref="INonAdoptableFailureMechanismSectionResultEntity"/>.
+    /// based on a <see cref="NonAdoptableFailureMechanismSectionResultEntity"/>.
     /// </summary>
     internal static class NonAdoptableFailureMechanismSectionResultEntityReadExtensions
     {
         /// <summary>
-        /// Reads the <see cref="INonAdoptableFailureMechanismSectionResultEntity"/> and use the information
+        /// Reads the <see cref="NonAdoptableFailureMechanismSectionResultEntity"/> and use the information
         /// to update a <see cref="NonAdoptableFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="INonAdoptableFailureMechanismSectionResultEntity"/> used to update 
+        /// <param name="entity">The <see cref="NonAdoptableFailureMechanismSectionResultEntity"/> used to update 
         /// the <paramref name="sectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        internal static void Read(this INonAdoptableFailureMechanismSectionResultEntity entity,
+        internal static void Read(this NonAdoptableFailureMechanismSectionResultEntity entity,
                                   NonAdoptableFailureMechanismSectionResult sectionResult)
         {
             if (entity == null)
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r0115ad2a4c6fe279524bac2238f465f34eaaca86 -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs)	(revision 0115ad2a4c6fe279524bac2238f465f34eaaca86)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -21,26 +21,27 @@
 
 using System;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Primitives;
 using Riskeer.Storage.Core.DbContext;
 
 namespace Riskeer.Storage.Core.Read.FailureMechanismSectionResults
 {
     /// <summary>
-    /// This class defines extension methods for read operations for an
+    /// This class defines extension methods for read operations for a
     /// <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
-    /// based on the <see cref="INonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/>.
+    /// based on a <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/>.
     /// </summary>
     internal static class NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensions
     {
         /// <summary>
-        /// Reads the <see cref="INonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> and use the information
+        /// Reads the <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> and use the information
         /// to update an <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="INonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> used to update 
+        /// <param name="entity">The <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity"/> used to update 
         /// the <paramref name="sectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        internal static void Read(this INonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity entity,
+        internal static void Read(this NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity entity,
                                   NonAdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult)
         {
             if (entity == null)
@@ -53,7 +54,11 @@
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            ((INonAdoptableFailureMechanismSectionResultEntity) entity).Read(sectionResult);
+            sectionResult.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
+            sectionResult.InitialFailureMechanismResultType = (NonAdoptableInitialFailureMechanismResultType) entity.InitialFailureMechanismResultType;
+            sectionResult.ManualInitialFailureMechanismResultSectionProbability = entity.ManualInitialFailureMechanismResultSectionProbability.ToNullAsNaN();
+            sectionResult.FurtherAnalysisType = (FailureMechanismSectionResultFurtherAnalysisType) entity.FurtherAnalysisType;
+            sectionResult.RefinedSectionProbability = entity.RefinedSectionProbability.ToNullAsNaN();
             sectionResult.ManualInitialFailureMechanismResultProfileProbability = entity.ManualInitialFailureMechanismResultProfileProbability.ToNullAsNaN();
             sectionResult.RefinedProfileProbability = entity.RefinedProfileProbability.ToNullAsNaN();
         }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/AdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re8a590f71b19fb8495d2ec5d007058fbb04484df -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/AdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../AdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision e8a590f71b19fb8495d2ec5d007058fbb04484df)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/AdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../AdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -25,8 +25,8 @@
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
+using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.FailureMechanismSectionResults;
-using Riskeer.Storage.Core.TestUtil.FailureMechanismResults;
 
 namespace Riskeer.Storage.Core.Test.Read.FailureMechanismSectionResults
 {
@@ -36,9 +36,11 @@
         [Test]
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var sectionResult = new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
             // Call
-            void Call() => ((TestAdoptableFailureMechanismSectionResultEntity) null).Read(new AdoptableFailureMechanismSectionResult(
-                                                                                              FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
+            void Call() => ((AdoptableFailureMechanismSectionResultEntity) null).Read(sectionResult);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -49,7 +51,7 @@
         public void Read_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
-            var entity = new TestAdoptableFailureMechanismSectionResultEntity();
+            var entity = new AdoptableFailureMechanismSectionResultEntity();
 
             // Call
             void Call() => entity.Read(null);
@@ -70,7 +72,7 @@
             var furtherAnalysisType = random.NextEnumValue<FailureMechanismSectionResultFurtherAnalysisType>();
             double refinedSectionProbability = random.NextDouble();
 
-            var entity = new TestAdoptableFailureMechanismSectionResultEntity
+            var entity = new AdoptableFailureMechanismSectionResultEntity
             {
                 IsRelevant = Convert.ToByte(isRelevant),
                 InitialFailureMechanismResultType = Convert.ToByte(initialFailureMechanismResultType),
@@ -95,7 +97,7 @@
         public void Read_EntityWithNullValues_SectionResultWithNaNValues()
         {
             // Setup
-            var entity = new TestAdoptableFailureMechanismSectionResultEntity();
+            var entity = new AdoptableFailureMechanismSectionResultEntity();
             var sectionResult = new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -rf0112d20fac2e2351885ca5e047f72ac825e92e3 -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision f0112d20fac2e2351885ca5e047f72ac825e92e3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../AdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -36,26 +36,29 @@
         [Test]
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var sectionResult = new AdoptableWithProfileProbabilityFailureMechanismSectionResult(
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
             // Call
-            TestDelegate call = () => ((PipingSectionResultEntity) null).Read(
-                new AdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
+            void Call() => ((AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity) null).Read(sectionResult);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("entity", exception.ParamName);
         }
 
         [Test]
         public void Read_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
-            var entity = new PipingSectionResultEntity();
+            var entity = new AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(null);
+            void Call() => entity.Read(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
             Assert.AreEqual("sectionResult", paramName);
         }
 
@@ -73,7 +76,7 @@
             double refinedProfileProbability = random.NextDouble();
             double refinedSectionProbability = random.NextDouble();
 
-            var entity = new PipingSectionResultEntity
+            var entity = new AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 IsRelevant = Convert.ToByte(isRelevant),
                 InitialFailureMechanismResultType = Convert.ToByte(initialFailureMechanismResultType),
@@ -85,7 +88,8 @@
                 RefinedSectionProbability = refinedSectionProbability
             };
 
-            var sectionResult = new AdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            var sectionResult = new AdoptableWithProfileProbabilityFailureMechanismSectionResult(
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
@@ -105,8 +109,9 @@
         public void Read_EntityWithNullValues_SectionResultWithNaNValues()
         {
             // Setup
-            var entity = new PipingSectionResultEntity();
-            var sectionResult = new AdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            var entity = new AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity();
+            var sectionResult = new AdoptableWithProfileProbabilityFailureMechanismSectionResult(
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re8a590f71b19fb8495d2ec5d007058fbb04484df -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../NonAdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision e8a590f71b19fb8495d2ec5d007058fbb04484df)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../NonAdoptableFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -25,8 +25,8 @@
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
+using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.FailureMechanismSectionResults;
-using Riskeer.Storage.Core.TestUtil.FailureMechanismResults;
 
 namespace Riskeer.Storage.Core.Test.Read.FailureMechanismSectionResults
 {
@@ -36,9 +36,11 @@
         [Test]
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var sectionResult = new NonAdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
             // Call
-            void Call() => ((TestNonAdoptableFailureMechanismSectionResultEntity) null).Read(new NonAdoptableFailureMechanismSectionResult(
-                                                                                                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
+            void Call() => ((NonAdoptableFailureMechanismSectionResultEntity) null).Read(sectionResult);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -49,7 +51,7 @@
         public void Read_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
-            var entity = new TestNonAdoptableFailureMechanismSectionResultEntity();
+            var entity = new NonAdoptableFailureMechanismSectionResultEntity();
 
             // Call
             void Call() => entity.Read(null);
@@ -70,7 +72,7 @@
             var furtherAnalysisType = random.NextEnumValue<FailureMechanismSectionResultFurtherAnalysisType>();
             double refinedSectionProbability = random.NextDouble();
 
-            var entity = new TestNonAdoptableFailureMechanismSectionResultEntity
+            var entity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 IsRelevant = Convert.ToByte(isRelevant),
                 InitialFailureMechanismResultType = Convert.ToByte(initialFailureMechanismResultType),
@@ -95,7 +97,7 @@
         public void Read_EntityWithNullValues_SectionResultWithNaNValues()
         {
             // Setup
-            var entity = new TestNonAdoptableFailureMechanismSectionResultEntity();
+            var entity = new NonAdoptableFailureMechanismSectionResultEntity();
             var sectionResult = new NonAdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -rf0112d20fac2e2351885ca5e047f72ac825e92e3 -rf92078cccae17631d16b560f65292f6ee6dae5a6
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision f0112d20fac2e2351885ca5e047f72ac825e92e3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs)	(revision f92078cccae17631d16b560f65292f6ee6dae5a6)
@@ -37,7 +37,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => ((StabilityStoneCoverSectionResultEntity) null).Read(
+            void Call() => ((NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity) null).Read(
                 new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
 
             // Assert
@@ -49,7 +49,7 @@
         public void Read_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
-            var entity = new StabilityStoneCoverSectionResultEntity();
+            var entity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity();
 
             // Call
             void Call() => entity.Read(null);
@@ -72,7 +72,7 @@
             double refinedProfileProbability = random.NextDouble();
             double refinedSectionProbability = random.NextDouble();
 
-            var entity = new StabilityStoneCoverSectionResultEntity
+            var entity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 IsRelevant = Convert.ToByte(isRelevant),
                 InitialFailureMechanismResultType = Convert.ToByte(initialFailureMechanismResultType),
@@ -83,7 +83,8 @@
                 RefinedSectionProbability = refinedSectionProbability
             };
 
-            var sectionResult = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            var sectionResult = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
@@ -102,8 +103,9 @@
         public void Read_EntityWithNullValues_SectionResultWithNaNValues()
         {
             // Setup
-            var entity = new StabilityStoneCoverSectionResultEntity();
-            var sectionResult = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            var entity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity();
+            var sectionResult = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);