Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r11eb517ba7a480b4a415855798a7fadefc0cfe54 -rdd8f41ce9d9ff9fd570874721a114560c7a71013
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision dd8f41ce9d9ff9fd570874721a114560c7a71013)
@@ -24,6 +24,7 @@
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.Features;
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using NUnit.Framework;
@@ -275,7 +276,7 @@
                 MapDataCollection mapData = map.Data;
                 Assert.IsInstanceOf<MapDataCollection>(mapData);
 
-                var mapDataList = mapData.Collection.ToList();
+                List<MapData> mapDataList = mapData.Collection.ToList();
                 Assert.AreEqual(8, mapDataList.Count);
                 MapDataTestHelper.AssertReferenceLineMapData(assessmentSection.ReferenceLine, mapDataList[referenceLineIndex]);
                 MapDataTestHelper.AssertFailureMechanismSectionsMapData(failureMechanism.Sections, mapDataList[sectionsIndex]);
@@ -720,7 +721,7 @@
                 mapData.Remove(dataToMove);
                 mapData.Add(dataToMove);
 
-                var mapDataList = mapData.Collection.ToList();
+                List<MapData> mapDataList = mapData.Collection.ToList();
 
                 // Precondition
                 var referenceLineData = (MapLineData) mapDataList[updatedRefenceLineLayerIndex];
@@ -825,7 +826,7 @@
             Assert.NotNull(structures, "structures should never be null.");
 
             var structuresData = (MapPointData) mapData;
-            var structuresArray = structures.ToArray();
+            StructureBase[] structuresArray = structures.ToArray();
 
             Assert.AreEqual(structuresArray.Length, structuresData.Features.Length);
 
@@ -842,13 +843,13 @@
         {
             Assert.IsInstanceOf<MapLineData>(mapData);
             var calculationsMapData = (MapLineData) mapData;
-            var calculationsArray = calculations.ToArray();
-            var calculationsFeatures = calculationsMapData.Features.ToArray();
+            StructuresCalculation<HeightStructuresInput>[] calculationsArray = calculations.ToArray();
+            MapFeature[] calculationsFeatures = calculationsMapData.Features.ToArray();
             Assert.AreEqual(calculationsArray.Length, calculationsFeatures.Length);
 
             for (var index = 0; index < calculationsArray.Length; index++)
             {
-                var geometries = calculationsFeatures[index].MapGeometries.ToArray();
+                MapGeometry[] geometries = calculationsFeatures[index].MapGeometries.ToArray();
                 Assert.AreEqual(1, geometries.Length);
 
                 StructuresCalculation<HeightStructuresInput> calculation = calculationsArray[index];
@@ -865,7 +866,7 @@
         {
             Assert.AreEqual("Kunstwerken - Hoogte kunstwerk", mapDataCollection.Name);
 
-            var mapDataList = mapDataCollection.Collection.ToList();
+            List<MapData> mapDataList = mapDataCollection.Collection.ToList();
 
             Assert.AreEqual(8, mapDataList.Count);