Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r714c7ce2697c5d1cb022d5fd5d65fe720e95c129 -r71924dca81e2a8be834e16b111334fca035b3701
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 714c7ce2697c5d1cb022d5fd5d65fe720e95c129)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
@@ -54,7 +54,8 @@
         public void SetUp()
         {
             plugin = new PipingPlugin();
-            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingOutputView));
+            info = plugin.GetViewInfos().First(tni => tni.DataType == typeof(ProbabilisticPipingProfileSpecificOutputContext) &&
+                                                      tni.ViewType == typeof(ProbabilisticFaultTreePipingOutputView));
         }
 
         [TearDown]
@@ -67,7 +68,6 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilisticPipingProfileSpecificOutputContext), info.DataType);
             Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType);
             TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image);
         }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -rc4b0663c2ee423e2fdf08b374299c5f6326c0dbb -r71924dca81e2a8be834e16b111334fca035b3701
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision c4b0663c2ee423e2fdf08b374299c5f6326c0dbb)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
@@ -54,7 +54,8 @@
         public void SetUp()
         {
             plugin = new PipingPlugin();
-            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingOutputView));
+            info = plugin.GetViewInfos().First(tni => tni.DataType == typeof(ProbabilisticPipingSectionSpecificOutputContext) &&
+                                                      tni.ViewType == typeof(ProbabilisticFaultTreePipingOutputView));
         }
 
         [TearDown]
@@ -67,7 +68,6 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilisticPipingSectionSpecificOutputContext), info.DataType);
             Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType);
             TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image);
         }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r6d63f22611860dfea08e8cd62ff2e7975e47c867 -r71924dca81e2a8be834e16b111334fca035b3701
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 6d63f22611860dfea08e8cd62ff2e7975e47c867)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
@@ -54,7 +54,8 @@
         public void SetUp()
         {
             plugin = new PipingPlugin();
-            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ProbabilisticSubMechanismPipingOutputView));
+            info = plugin.GetViewInfos().First(tni => tni.DataType == typeof(ProbabilisticPipingProfileSpecificOutputContext) &&
+                                                      tni.ViewType == typeof(ProbabilisticSubMechanismPipingOutputView));
         }
 
         [TearDown]
@@ -67,7 +68,6 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilisticPipingProfileSpecificOutputContext), info.DataType);
             Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType);
             TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image);
         }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r6d63f22611860dfea08e8cd62ff2e7975e47c867 -r71924dca81e2a8be834e16b111334fca035b3701
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 6d63f22611860dfea08e8cd62ff2e7975e47c867)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
@@ -54,7 +54,8 @@
         public void SetUp()
         {
             plugin = new PipingPlugin();
-            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ProbabilisticSubMechanismPipingOutputView));
+            info = plugin.GetViewInfos().First(tni => tni.DataType == typeof(ProbabilisticPipingSectionSpecificOutputContext) &&
+                                                      tni.ViewType == typeof(ProbabilisticSubMechanismPipingOutputView));
         }
 
         [TearDown]
@@ -67,7 +68,6 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilisticPipingSectionSpecificOutputContext), info.DataType);
             Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType);
             TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image);
         }