Index: Core/Gui/test/Core.Gui.TestUtil/PluginTestHelper.cs
===================================================================
diff -u -rde83556154a382cf617783426d7c36ebfa91698a -rcd6c1e05636d86b8524ad28a47a2e553a24165e5
--- Core/Gui/test/Core.Gui.TestUtil/PluginTestHelper.cs	(.../PluginTestHelper.cs)	(revision de83556154a382cf617783426d7c36ebfa91698a)
+++ Core/Gui/test/Core.Gui.TestUtil/PluginTestHelper.cs	(.../PluginTestHelper.cs)	(revision cd6c1e05636d86b8524ad28a47a2e553a24165e5)
@@ -72,9 +72,8 @@
         public static ViewInfo AssertViewInfoDefined(IEnumerable<ViewInfo> viewInfos, Type dataType, Type viewDataType, Type viewType)
         {
             Assert.NotNull(viewInfos);
-            ViewInfo viewInfo = viewInfos.SingleOrDefault(vi => vi.ViewDataType == viewDataType && vi.ViewType == viewType);
-            Assert.NotNull(viewInfo, "Could not find viewInfo for the combination of viewDataType {0} and viewType {1} ", viewDataType, viewType);
-            Assert.AreEqual(dataType, viewInfo.DataType);
+            ViewInfo viewInfo = viewInfos.SingleOrDefault(vi => vi.DataType == dataType && vi.ViewDataType == viewDataType && vi.ViewType == viewType);
+            Assert.NotNull(viewInfo, "Could not find viewInfo for the combination of dataType {0}, viewDataType {1} and viewType {2} ", dataType, viewDataType, viewType);
             return viewInfo;
         }
 
Index: Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/PartialProbabilisticPipingOutput.cs
===================================================================
diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -rcd6c1e05636d86b8524ad28a47a2e553a24165e5
--- Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/PartialProbabilisticPipingOutput.cs	(.../PartialProbabilisticPipingOutput.cs)	(revision c37eebd9171a53987f5929013edbe3d82e618ed0)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/PartialProbabilisticPipingOutput.cs	(.../PartialProbabilisticPipingOutput.cs)	(revision cd6c1e05636d86b8524ad28a47a2e553a24165e5)
@@ -27,7 +27,7 @@
     /// This class contains the result of a sub-calculation for a <see cref="ProbabilisticPipingCalculation"/>.
     /// </summary>
     /// <typeparam name="T">The type of the top level illustration point.</typeparam>
-    public class PartialProbabilisticPipingOutput<T> : IPartialProbabilisticPipingOutput
+    public abstract class PartialProbabilisticPipingOutput<T> : IPartialProbabilisticPipingOutput
         where T : TopLevelIllustrationPointBase
     {
         /// <summary>
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingOutputProperties.cs
===================================================================
diff -u -r9885f0e3a0e8b9d13ad802a76baf8db1228d2b72 -rcd6c1e05636d86b8524ad28a47a2e553a24165e5
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingOutputProperties.cs	(.../ProbabilisticPipingOutputProperties.cs)	(revision 9885f0e3a0e8b9d13ad802a76baf8db1228d2b72)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingOutputProperties.cs	(.../ProbabilisticPipingOutputProperties.cs)	(revision cd6c1e05636d86b8524ad28a47a2e553a24165e5)
@@ -34,7 +34,7 @@
     /// <summary>
     /// ViewModel of <see cref="IPartialProbabilisticPipingOutput"/> for properties panel.
     /// </summary>
-    public class ProbabilisticPipingOutputProperties : ObjectProperties<IPartialProbabilisticPipingOutput>
+    public abstract class ProbabilisticPipingOutputProperties : ObjectProperties<IPartialProbabilisticPipingOutput>
     {
         private const int probabilityIndex = 0;
         private const int reliabilityIndex = 1;