Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -rd34720bc7fe019afec92b91f017b56618dafa95d -r258acae55e0ae70bcc094a2f7a577b7fbc8d8f2e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision d34720bc7fe019afec92b91f017b56618dafa95d)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 258acae55e0ae70bcc094a2f7a577b7fbc8d8f2e)
@@ -97,7 +97,7 @@
         [Test]
         [TestCase(false)]
         [TestCase(true)]
-        public void Read_WithBackgroundMapData_ReturnsNewAssessmentSectionWithBackgroundMapData(bool isConfigured)
+        public void Read_WithBackgroundData_ReturnsNewAssessmentSectionWithBackgroundData(bool isConfigured)
         {
             // Setup
             const string mapDataName = "Background";
@@ -128,28 +128,24 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            var section = entity.Read(collector);
+            AssessmentSection section = entity.Read(collector);
 
             // Assert
-            BackgroundMapDataContainer container = section.BackgroundMapData;
-            Assert.AreEqual(isVisible, container.IsVisible);
-            Assert.AreEqual(transparency, container.Transparency);
+            BackgroundData backgroundData = section.BackgroundData;
+            Assert.AreEqual(isVisible, backgroundData.IsVisible);
+            Assert.AreEqual(transparency, backgroundData.Transparency);
+            Assert.AreEqual(isConfigured, backgroundData.IsConfigured);
+            Assert.AreEqual(mapDataName, backgroundData.Name);
 
-            var backgroundMapData = (WmtsMapData)container.MapData;
-            Assert.AreEqual(isConfigured, backgroundMapData.IsConfigured);
-            Assert.AreEqual(mapDataName, backgroundMapData.Name);
-
             if (isConfigured)
             {
-                Assert.AreEqual(sourceCapabilitiesUrl, backgroundMapData.SourceCapabilitiesUrl);
-                Assert.AreEqual(selectedCapabilityName, backgroundMapData.SelectedCapabilityIdentifier);
-                Assert.AreEqual(preferredFormat, backgroundMapData.PreferredFormat);
+                Assert.AreEqual(sourceCapabilitiesUrl, backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl]);
+                Assert.AreEqual(selectedCapabilityName, backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier]);
+                Assert.AreEqual(preferredFormat, backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat]);
             }
             else
             {
-                Assert.IsNull(backgroundMapData.SourceCapabilitiesUrl);
-                Assert.IsNull(backgroundMapData.SelectedCapabilityIdentifier);
-                Assert.IsNull(backgroundMapData.PreferredFormat);
+                CollectionAssert.IsEmpty(backgroundData.Parameters);
             }
         }