Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -rdf44be36b5c375ff32cd94086af5e6610ec9fc3a -r77b27109212e94d58eb47248d4210f7eac243fb6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision df44be36b5c375ff32cd94086af5e6610ec9fc3a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision 77b27109212e94d58eb47248d4210f7eac243fb6)
@@ -406,38 +406,39 @@
             }
         }
 
-//        [Test]
-//        [TestCase(AssessmentLayerOneState.NotAssessed)]
-//        [TestCase(AssessmentLayerOneState.NoVerdict)]
-//        public void FailureMechanismResultView_AssessmentLayerTwoANaN_ShowsErrorTooltip(AssessmentLayerOneState assessmentLayerOneState)
-//        {
-//            // Setup
-//            const int rowIndex = 0;
-//
-//            var pipingFailureMechanism = new PipingFailureMechanism();
-//            using (PipingFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism))
-//            {
-//                PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(
-//                    pipingFailureMechanism.Sections.First());
-//                pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario);
-//                view.Data = pipingFailureMechanism.SectionResults;
-//
-//                var gridTester = new ControlTester("dataGridView");
-//                var dataGridView = (DataGridView) gridTester.TheObject;
-//
-//                DataGridViewCell dataGridViewCell = dataGridView.Rows[rowIndex].Cells[assessmentLayerTwoAIndex];
-//                dataGridView.Rows[rowIndex].Cells[assessmentLayerOneIndex].Value = assessmentLayerOneState;
-//
-//                // Call
-//                object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event.
-//
-//                // Assert
-//                Assert.AreEqual("Alle berekeningen voor dit vak moeten een geldige uitkomst hebben.",
-//                                dataGridViewCell.ErrorText);
-//                Assert.AreEqual("-", formattedValue);
-//            }
-//        }
+        [Test]
+        [TestCase(AssessmentLayerOneState.NotAssessed)]
+        [TestCase(AssessmentLayerOneState.NoVerdict)]
+        public void FailureMechanismResultView_AssessmentLayerTwoANaN_ShowsErrorTooltip(AssessmentLayerOneState assessmentLayerOneState)
+        {
+            // Setup
+            const int rowIndex = 0;
 
+            var pipingFailureMechanism = new PipingFailureMechanism();
+            using (PipingFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism))
+            {
+                PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(
+                    pipingFailureMechanism.Sections.First());
+                calculationScenario.Output = new PipingOutput(new PipingOutput.ConstructionProperties());
+                pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario);
+                view.Data = pipingFailureMechanism.SectionResults;
+
+                var gridTester = new ControlTester("dataGridView");
+                var dataGridView = (DataGridView) gridTester.TheObject;
+
+                DataGridViewCell dataGridViewCell = dataGridView.Rows[rowIndex].Cells[assessmentLayerTwoAIndex];
+                dataGridView.Rows[rowIndex].Cells[assessmentLayerOneIndex].Value = assessmentLayerOneState;
+
+                // Call
+                object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event.
+
+                // Assert
+                Assert.AreEqual("Alle berekeningen voor dit vak moeten een geldige uitkomst hebben.",
+                                dataGridViewCell.ErrorText);
+                Assert.AreEqual("-", formattedValue);
+            }
+        }
+
         [Test]
         [TestCase(AssessmentLayerOneState.NotAssessed)]
         [TestCase(AssessmentLayerOneState.NoVerdict)]
@@ -496,34 +497,35 @@
             }
         }
 
-//        [Test]
-//        public void FailureMechanismResultView_AssessmentLayerOneStateSufficientAndAssessmentLayerTwoAHasError_DoesNotShowError()
-//        {
-//            // Setup
-//            const int rowIndex = 0;
-//
-//            var pipingFailureMechanism = new PipingFailureMechanism();
-//            using (ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism))
-//            {
-//                PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(
-//                    pipingFailureMechanism.Sections.First());
-//                pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario);
-//
-//                var gridTester = new ControlTester("dataGridView");
-//                var dataGridView = (DataGridView) gridTester.TheObject;
-//
-//                DataGridViewCell dataGridViewCell = dataGridView.Rows[rowIndex].Cells[assessmentLayerTwoAIndex];
-//
-//                // Call
-//                dataGridView.Rows[rowIndex].Cells[assessmentLayerOneIndex].Value = AssessmentLayerOneState.Sufficient;
-//                object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event.
-//
-//                // Assert
-//                Assert.IsEmpty(dataGridViewCell.ErrorText);
-//                Assert.AreEqual("-", formattedValue);
-//            }
-//        }
+        [Test]
+        public void FailureMechanismResultView_AssessmentLayerOneStateSufficientAndAssessmentLayerTwoAHasError_DoesNotShowError()
+        {
+            // Setup
+            const int rowIndex = 0;
 
+            var pipingFailureMechanism = new PipingFailureMechanism();
+            using (ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism))
+            {
+                PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(
+                    pipingFailureMechanism.Sections.First());
+                calculationScenario.Output = new PipingOutput(new PipingOutput.ConstructionProperties());
+                pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario);
+
+                var gridTester = new ControlTester("dataGridView");
+                var dataGridView = (DataGridView) gridTester.TheObject;
+
+                DataGridViewCell dataGridViewCell = dataGridView.Rows[rowIndex].Cells[assessmentLayerTwoAIndex];
+
+                // Call
+                dataGridView.Rows[rowIndex].Cells[assessmentLayerOneIndex].Value = AssessmentLayerOneState.Sufficient;
+                object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event.
+
+                // Assert
+                Assert.IsEmpty(dataGridViewCell.ErrorText);
+                Assert.AreEqual("-", formattedValue);
+            }
+        }
+
         private PipingFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView(PipingFailureMechanism failureMechanism)
         {
             failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List<Point2D>