Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -rd3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2 -r8e310b99d8873ca1a46282c54302acb1d1678dab
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs	(.../PipingFailureMechanismCreateExtensionsTest.cs)	(revision d3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs	(.../PipingFailureMechanismCreateExtensionsTest.cs)	(revision 8e310b99d8873ca1a46282c54302acb1d1678dab)
@@ -59,7 +59,18 @@
             var failureMechanism = new PipingFailureMechanism
             {
                 IsRelevant = isRelevant,
-                Comments = "Some text",
+                InputComments =
+                {
+                    Comments = "Some input text"
+                },
+                OutputComments =
+                {
+                    Comments = "Some output text"
+                },
+                NotRelevantComments =
+                {
+                    Comments = "Really not relevant"
+                },
                 PipingProbabilityAssessmentInput =
                 {
                     A = 0.9876
@@ -74,7 +85,9 @@
             Assert.IsNotNull(entity);
             Assert.AreEqual((short) FailureMechanismType.Piping, entity.FailureMechanismType);
             Assert.AreEqual(Convert.ToByte(isRelevant), entity.IsRelevant);
-            Assert.AreEqual(failureMechanism.Comments, entity.Comments);
+            Assert.AreEqual(failureMechanism.InputComments.Comments, entity.InputComments);
+            Assert.AreEqual(failureMechanism.OutputComments.Comments, entity.OutputComments);
+            Assert.AreEqual(failureMechanism.NotRelevantComments.Comments, entity.NotRelevantComments);
             CollectionAssert.IsEmpty(entity.StochasticSoilModelEntities);
 
             var failureMechanismMetaEntity = entity.PipingFailureMechanismMetaEntities.ToArray()[0];
@@ -85,20 +98,39 @@
         public void Create_StringPropertiesDoNotShareReference()
         {
             // Setup
-            const string originalComments = "Some text";
+            const string originalInput = "Some input text";
+            const string originalOutput = "Some output text";
+            const string originalNotRelevantText = "Really not relevant";
             var failureMechanism = new PipingFailureMechanism
             {
-                Comments = originalComments
+                InputComments =
+                {
+                    Comments = originalInput
+                },
+                OutputComments =
+                {
+                    Comments = originalOutput
+                },
+                NotRelevantComments =
+                {
+                    Comments = originalNotRelevantText
+                }
             };
             var registry = new PersistenceRegistry();
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(registry);
 
             // Assert
-            Assert.AreNotSame(originalComments, entity.Comments,
+            Assert.AreNotSame(originalInput, entity.InputComments,
                               "To create stable binary representations/fingerprints, it's really important that strings are not shared.");
-            Assert.AreEqual(originalComments, entity.Comments);
+            Assert.AreEqual(failureMechanism.InputComments.Comments, entity.InputComments);
+            Assert.AreNotSame(originalOutput, entity.OutputComments,
+                              "To create stable binary representations/fingerprints, it's really important that strings are not shared.");
+            Assert.AreEqual(failureMechanism.OutputComments.Comments, entity.OutputComments);
+            Assert.AreNotSame(originalNotRelevantText, entity.NotRelevantComments,
+                              "To create stable binary representations/fingerprints, it's really important that strings are not shared.");
+            Assert.AreEqual(failureMechanism.NotRelevantComments.Comments, entity.NotRelevantComments);
         }
 
         [Test]