Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs
===================================================================
diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -r0873bffb838ee571a6cc827c5771bb4e540bd736
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 548d487e693b335827451b4f395f1b30e20b9e3e)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 0873bffb838ee571a6cc827c5771bb4e540bd736)
@@ -54,6 +54,8 @@
             CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles);
 
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs
===================================================================
diff -u -r3c1ada872501043f0a1713c6a3a9af7aae23a56b -r0873bffb838ee571a6cc827c5771bb4e540bd736
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs	(.../FailurePathEntityReadExtensionsTest.cs)	(revision 3c1ada872501043f0a1713c6a3a9af7aae23a56b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs	(.../FailurePathEntityReadExtensionsTest.cs)	(revision 0873bffb838ee571a6cc827c5771bb4e540bd736)
@@ -130,7 +130,7 @@
             var failureMechanism = new TestFailureMechanism();
 
             // Call
-            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+            entity.ReadCommonFailurePathProperties(failureMechanism, collector);
 
             // Assert
             Assert.IsNull(failureMechanism.InAssemblyInputComments.Body);
@@ -160,7 +160,7 @@
             var failureMechanism = new TestFailureMechanism();
 
             // Call
-            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+            entity.ReadCommonFailurePathProperties(failureMechanism, collector);
 
             // Assert
             Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count());
@@ -172,11 +172,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var failureMechanism = mocks.Stub<ICalculatableFailureMechanism>();
             mocks.ReplayAll();
 
             // Call
-            void Call() => ((FailureMechanismEntity) null).ReadCommonFailurePathProperties(failureMechanism, new ReadConversionCollector());
+            void Call() => ((FailureMechanismEntity) null).ReadCommonFailureMechanismProperties(failureMechanism, new ReadConversionCollector());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -203,13 +203,13 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var failureMechanism = mocks.Stub<ICalculatableFailureMechanism>();
             mocks.ReplayAll();
 
             var entity = new FailureMechanismEntity();
 
             // Call
-            void Call() => entity.ReadCommonFailurePathProperties(failureMechanism, null);
+            void Call() => entity.ReadCommonFailureMechanismProperties(failureMechanism, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);