Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r35c595cd0cda9b410a386c8b37878a163071834e -rc1aa383725fd31521b56e16d177e18ffcbe4a1f9
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 35c595cd0cda9b410a386c8b37878a163071834e)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c1aa383725fd31521b56e16d177e18ffcbe4a1f9)
@@ -444,15 +444,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Assembleren.
-        /// </summary>
-        public static string RiskeerPlugin_GetStateInfos_Assembly {
-            get {
-                return ResourceManager.GetString("RiskeerPlugin_GetStateInfos_Assembly", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Traject.
         /// </summary>
         public static string RiskeerPlugin_GetStateInfos_AssessmentSection {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r35c595cd0cda9b410a386c8b37878a163071834e -rc1aa383725fd31521b56e16d177e18ffcbe4a1f9
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 35c595cd0cda9b410a386c8b37878a163071834e)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision c1aa383725fd31521b56e16d177e18ffcbe4a1f9)
@@ -246,9 +246,6 @@
   <data name="RiskeerPlugin_GetStateInfos_Calculations" xml:space="preserve">
     <value>Berekeningen</value>
   </data>
-  <data name="RiskeerPlugin_GetStateInfos_Assembly" xml:space="preserve">
-    <value>Assembleren</value>
-  </data>
   <data name="AssessmentSectionFromFileCommandHandler_CreateAssessmentSection_No_settings_found_for_AssessmentSection" xml:space="preserve">
     <value>Er zijn geen instellingen gevonden voor het geselecteerde traject. Standaardinstellingen zullen gebruikt worden.</value>
   </data>
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r4b1cf32e387b15bd77d9effa82a808ba400ba036 -rc1aa383725fd31521b56e16d177e18ffcbe4a1f9
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 4b1cf32e387b15bd77d9effa82a808ba400ba036)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision c1aa383725fd31521b56e16d177e18ffcbe4a1f9)
@@ -340,28 +340,14 @@
                         assessmentSection.TechnicalInnovation
                     };
 
-                    return failureMechanisms.Select(failureMechanism => failureMechanismAssociations
-                                                                        .First(a => a.Match(failureMechanism))
-                                                                        .Create(failureMechanism, assessmentSection))
-                                            .ToArray();
-                }
+                    List<object> objects = failureMechanisms.Select(failureMechanism => failureMechanismAssociations
+                                                                                        .First(a => a.Match(failureMechanism))
+                                                                                        .Create(failureMechanism, assessmentSection))
+                                                            .ToList();
 
-                return null;
-            });
+                    objects.Add(new AssemblyResultsContext(assessmentSection));
 
-            yield return new StateInfo(Resources.RiskeerPlugin_GetStateInfos_Assembly, "\uE94B", project =>
-            {
-                if (project is RiskeerProject riskeerProject)
-                {
-                    AssessmentSection assessmentSection = riskeerProject.AssessmentSections.First();
-
-                    return new object[]
-                    {
-                        new AssemblyResultCategoriesContext(assessmentSection),
-                        new AssemblyResultTotalContext(assessmentSection),
-                        new AssemblyResultPerSectionContext(assessmentSection),
-                        new AssemblyResultPerSectionMapContext(assessmentSection)
-                    };
+                    return objects.ToArray();
                 }
 
                 return null;
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r4b1cf32e387b15bd77d9effa82a808ba400ba036 -rc1aa383725fd31521b56e16d177e18ffcbe4a1f9
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 4b1cf32e387b15bd77d9effa82a808ba400ba036)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision c1aa383725fd31521b56e16d177e18ffcbe4a1f9)
@@ -224,11 +224,10 @@
                 StateInfo[] stateInfos = plugin.GetStateInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(4, stateInfos.Length);
+                Assert.AreEqual(3, stateInfos.Length);
                 Assert.IsTrue(stateInfos.Any(si => si.Name == "Traject"));
                 Assert.IsTrue(stateInfos.Any(si => si.Name == "Berekeningen"));
                 Assert.IsTrue(stateInfos.Any(si => si.Name == "Faalpaden"));
-                Assert.IsTrue(stateInfos.Any(si => si.Name == "Assembleren"));
             }
         }
 
Fisheye: Tag c1aa383725fd31521b56e16d177e18ffcbe4a1f9 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/AssemblyStateInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs
===================================================================
diff -u -r7510baccf3709c9b68c5da797a5bb0663d4db772 -rc1aa383725fd31521b56e16d177e18ffcbe4a1f9
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs	(.../FailurePathsStateInfoTest.cs)	(revision 7510baccf3709c9b68c5da797a5bb0663d4db772)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs	(.../FailurePathsStateInfoTest.cs)	(revision c1aa383725fd31521b56e16d177e18ffcbe4a1f9)
@@ -26,6 +26,7 @@
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Integration.Data;
+using Riskeer.Integration.Forms.PresentationObjects;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 
 namespace Riskeer.Integration.Plugin.Test.StateInfos
@@ -75,7 +76,7 @@
             // Assert
             var rootDataCollection = rootData as object[];
             Assert.IsNotNull(rootDataCollection);
-            Assert.AreEqual(8, rootDataCollection.Length);
+            Assert.AreEqual(9, rootDataCollection.Length);
             Assert.AreEqual(new MacroStabilityOutwardsFailureMechanismContext(assessmentSection.MacroStabilityOutwards, assessmentSection), rootDataCollection[0]);
             Assert.AreEqual(new MicrostabilityFailureMechanismContext(assessmentSection.Microstability, assessmentSection), rootDataCollection[1]);
             Assert.AreEqual(new WaterPressureAsphaltCoverFailureMechanismContext(assessmentSection.WaterPressureAsphaltCover, assessmentSection), rootDataCollection[2]);
@@ -84,6 +85,7 @@
             Assert.AreEqual(new PipingStructureFailureMechanismContext(assessmentSection.PipingStructure, assessmentSection), rootDataCollection[5]);
             Assert.AreEqual(new StrengthStabilityLengthwiseConstructionFailureMechanismContext(assessmentSection.StrengthStabilityLengthwiseConstruction, assessmentSection), rootDataCollection[6]);
             Assert.AreEqual(new TechnicalInnovationFailureMechanismContext(assessmentSection.TechnicalInnovation, assessmentSection), rootDataCollection[7]);
+            Assert.AreEqual(new AssemblyResultsContext(assessmentSection), rootDataCollection[8]);
         }
 
         [Test]