Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs
===================================================================
diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r46d7b2777d17cf40089201054d722bce6398717d
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision 6257662de18fbfde1fa3285f82648f2798cdc511)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision 46d7b2777d17cf40089201054d722bce6398717d)
@@ -281,7 +281,8 @@
         private class SimpleFailureMechanismBase : FailureMechanismBase
         {
             public SimpleFailureMechanismBase(string name = "SomeName",
-                                              string failureMechanismCode = "SomeCode") : base(name, failureMechanismCode) {}
+                                              string failureMechanismCode = "SomeCode")
+                : base(name, failureMechanismCode) {}
 
             public override IEnumerable<ICalculation> Calculations => throw new NotImplementedException();
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs
===================================================================
diff -u -rabbb37e4aa1bceb60013db9d40a25afbf8d61595 -r46d7b2777d17cf40089201054d722bce6398717d
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision abbb37e4aa1bceb60013db9d40a25afbf8d61595)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision 46d7b2777d17cf40089201054d722bce6398717d)
@@ -60,29 +60,33 @@
         public void GivenFailureMechanismResultObserverWithAttachedObserver_WhenFailureMechanismNotifiesObservers_ThenAttachedObserverNotified()
         {
             // Given
-            var failureMechanism = new TestFailureMechanism();
+            var mocks = new MockRepository();
+            var observer = mocks.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
 
+            var failureMechanism = new TestFailureMechanism();
             using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(failureMechanism))
             {
-                var mocks = new MockRepository();
-                var observer = mocks.StrictMock<IObserver>();
-                observer.Expect(o => o.UpdateObserver());
-                mocks.ReplayAll();
-
                 resultObserver.Attach(observer);
 
                 // When
                 failureMechanism.NotifyObservers();
-
-                // Then
-                mocks.VerifyAll();
             }
+
+            // Then
+            mocks.VerifyAll();
         }
 
         [Test]
         public void GivenFailureMechanismResultObserverWithAttachedObserver_WhenFailureMechanismSectionResultNotifiesObservers_ThenAttachedObserverNotified()
         {
             // Given
+            var mocks = new MockRepository();
+            var observer = mocks.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
+
             var failureMechanism = new TestFailureMechanism();
             FailureMechanismTestHelper.SetSections(failureMechanism, new[]
             {
@@ -91,42 +95,36 @@
 
             using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(failureMechanism))
             {
-                var mocks = new MockRepository();
-                var observer = mocks.StrictMock<IObserver>();
-                observer.Expect(o => o.UpdateObserver());
-                mocks.ReplayAll();
-
                 resultObserver.Attach(observer);
 
                 // When
                 failureMechanism.SectionResults.Single().NotifyObservers();
-
-                // Then
-                mocks.VerifyAll();
             }
+
+            // Then
+            mocks.VerifyAll();
         }
 
         [Test]
         public void GivenFailureMechanismResultObserverWithAttachedObserver_WhenFailureMechanismAssemblyResultNotifiesObservers_ThenAttachedObserverNotified()
         {
             // Given
-            var failureMechanism = new TestFailureMechanism();
+            var mocks = new MockRepository();
+            var observer = mocks.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
 
+            var failureMechanism = new TestFailureMechanism();
             using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(failureMechanism))
             {
-                var mocks = new MockRepository();
-                var observer = mocks.StrictMock<IObserver>();
-                observer.Expect(o => o.UpdateObserver());
-                mocks.ReplayAll();
-
                 resultObserver.Attach(observer);
 
                 // When
                 failureMechanism.AssemblyResult.NotifyObservers();
-
-                // Then
-                mocks.VerifyAll();
             }
+
+            // Then
+            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismAssemblyResultRow.cs
===================================================================
diff -u -ra1e3955c347d1ca442522d998aef0ca0b88eb9a2 -r46d7b2777d17cf40089201054d722bce6398717d
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismAssemblyResultRow.cs	(.../FailureMechanismAssemblyResultRow.cs)	(revision a1e3955c347d1ca442522d998aef0ca0b88eb9a2)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismAssemblyResultRow.cs	(.../FailureMechanismAssemblyResultRow.cs)	(revision 46d7b2777d17cf40089201054d722bce6398717d)
@@ -43,7 +43,7 @@
         /// Creates a new instance of <see cref="FailureMechanismAssemblyResultRow"/>.
         /// </summary>
         /// <param name="failureMechanism">The <see cref="IFailureMechanism"/> to wrap so that it can be displayed as a row.</param>
-        /// <param name="performAssemblyFunc"></param>
+        /// <param name="performAssemblyFunc">The <see cref="Func{T,T2}"/> used to assemble the result of a failure mechanism.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameters is <c>null</c>.</exception>
         public FailureMechanismAssemblyResultRow(IFailureMechanism failureMechanism,
                                                  Func<double> performAssemblyFunc)
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Controls/AssessmentSectionAssemblyResultControlTest.cs
===================================================================
diff -u -rb77387773ed1a5e62224afb2f84a555e03e35ba0 -r46d7b2777d17cf40089201054d722bce6398717d
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Controls/AssessmentSectionAssemblyResultControlTest.cs	(.../AssessmentSectionAssemblyResultControlTest.cs)	(revision b77387773ed1a5e62224afb2f84a555e03e35ba0)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Controls/AssessmentSectionAssemblyResultControlTest.cs	(.../AssessmentSectionAssemblyResultControlTest.cs)	(revision 46d7b2777d17cf40089201054d722bce6398717d)
@@ -38,7 +38,7 @@
     public class AssessmentSectionAssemblyResultControlTest
     {
         [Test]
-        public void DefaultConstructor_ExpectedValues()
+        public void Constructor_ExpectedValues()
         {
             // Call
             using (var form = new Form())
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs
===================================================================
diff -u -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 -r46d7b2777d17cf40089201054d722bce6398717d
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs	(.../AssemblyResultTotalViewTest.cs)	(revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs	(.../AssemblyResultTotalViewTest.cs)	(revision 46d7b2777d17cf40089201054d722bce6398717d)
@@ -85,10 +85,10 @@
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new AssemblyResultTotalView(null);
+            void Call() => new AssemblyResultTotalView(null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }