Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Controls/AssessmentSectionAssemblyControlTest.cs
===================================================================
diff -u -r5f24b9f44bf75f735f6b9171ec6ce482fa0dcc7f -ree93ac5bb6cb37107dfbef6ea72287cf67f83cc0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Controls/AssessmentSectionAssemblyControlTest.cs	(.../AssessmentSectionAssemblyControlTest.cs)	(revision 5f24b9f44bf75f735f6b9171ec6ce482fa0dcc7f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Controls/AssessmentSectionAssemblyControlTest.cs	(.../AssessmentSectionAssemblyControlTest.cs)	(revision ee93ac5bb6cb37107dfbef6ea72287cf67f83cc0)
@@ -76,37 +76,55 @@
                 resultControl.SetAssemblyResult(result);
 
                 // Assert
-                Control groupLabel = GetGroupLabel(resultControl);
-                Control probabilityLabel = GetProbabilityLabel(resultControl);
+                BorderedLabel groupLabel = GetGroupLabel(resultControl);
+                BorderedLabel probabilityLabel = GetProbabilityLabel(resultControl);
 
-                Assert.AreEqual(new EnumDisplayWrapper<AssessmentSectionAssemblyCategoryGroup>(result.Group).DisplayName,
-                                groupLabel.Text);
-                Assert.AreEqual(AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(result.Group),
-                                groupLabel.BackColor);
-
-                Assert.AreEqual(new NoProbabilityValueDoubleConverter().ConvertToString(result.Probability),
-                                probabilityLabel.Text);
+                AssertGroupLabel(result, groupLabel);
+                AssertProbabilityLabel(result, probabilityLabel);
             }
         }
 
         [Test]
         public void ClearData_Always_ClearsDataOnControl()
         {
             // Setup
+            var random = new Random(39);
+
             using (var resultControl = new AssessmentSectionAssemblyControl())
             {
+                var result = new AssessmentSectionAssembly(random.NextDouble(),
+                                                           random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>());
+                resultControl.SetAssemblyResult(result);
+
+                // Precondition
+                BorderedLabel groupLabel = GetGroupLabel(resultControl);
+                BorderedLabel probabilityLabel = GetProbabilityLabel(resultControl);
+                AssertGroupLabel(result, groupLabel);
+                AssertProbabilityLabel(result, probabilityLabel);
                 // Call
                 resultControl.ClearData();
 
                 // Assert
-                BorderedLabel groupLabel = GetGroupLabel(resultControl);
-                BorderedLabel probabilityLabel = GetProbabilityLabel(resultControl);
                 Assert.IsEmpty(groupLabel.Text);
                 Assert.AreEqual(Color.White, groupLabel.BackColor);
                 Assert.AreEqual("-", probabilityLabel.Text);
             }
         }
 
+        private static void AssertProbabilityLabel(AssessmentSectionAssembly result, BorderedLabel probabilityLabel)
+        {
+            Assert.AreEqual(new NoProbabilityValueDoubleConverter().ConvertToString(result.Probability),
+                            probabilityLabel.Text);
+        }
+
+        private static void AssertGroupLabel(AssessmentSectionAssembly result, BorderedLabel groupLabel)
+        {
+            Assert.AreEqual(new EnumDisplayWrapper<AssessmentSectionAssemblyCategoryGroup>(result.Group).DisplayName,
+                            groupLabel.Text);
+            Assert.AreEqual(AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(result.Group),
+                            groupLabel.BackColor);
+        }
+
         private static BorderedLabel GetGroupLabel(AssessmentSectionAssemblyControl resultControl)
         {
             return (BorderedLabel) ((TableLayoutPanel) resultControl.Controls["GroupPanel"]).GetControlFromPosition(0, 0);