Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -84,36 +84,36 @@
         /// <summary>
         ///   Looks up a localized string similar to De parameter &apos;C&apos; die gebruikt wordt om het lengte-effect te berekenen..
         /// </summary>
-        public static string ClosingStructureFailureMechanismContextProperties_C_Description {
+        public static string ClosingStructuresFailureMechanismContextProperties_C_Description {
             get {
-                return ResourceManager.GetString("ClosingStructureFailureMechanismContextProperties_C_Description", resourceCulture);
+                return ResourceManager.GetString("ClosingStructuresFailureMechanismContextProperties_C_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to C [-].
         /// </summary>
-        public static string ClosingStructureFailureMechanismContextProperties_C_DisplayName {
+        public static string ClosingStructuresFailureMechanismContextProperties_C_DisplayName {
             get {
-                return ResourceManager.GetString("ClosingStructureFailureMechanismContextProperties_C_DisplayName", resourceCulture);
+                return ResourceManager.GetString("ClosingStructuresFailureMechanismContextProperties_C_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De parameter &apos;2NA&apos; die gebruikt wordt om het lengte-effect te berekenen..
         /// </summary>
-        public static string ClosingStructureFailureMechanismContextProperties_N2A_Description {
+        public static string ClosingStructuresFailureMechanismContextProperties_N2A_Description {
             get {
-                return ResourceManager.GetString("ClosingStructureFailureMechanismContextProperties_N2A_Description", resourceCulture);
+                return ResourceManager.GetString("ClosingStructuresFailureMechanismContextProperties_N2A_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to 2NA [-].
         /// </summary>
-        public static string ClosingStructureFailureMechanismContextProperties_N2A_DisplayName {
+        public static string ClosingStructuresFailureMechanismContextProperties_N2A_DisplayName {
             get {
-                return ResourceManager.GetString("ClosingStructureFailureMechanismContextProperties_N2A_DisplayName", resourceCulture);
+                return ResourceManager.GetString("ClosingStructuresFailureMechanismContextProperties_N2A_DisplayName", resourceCulture);
             }
         }
         
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -147,16 +147,16 @@
   <data name="FailureProbabilityReparation_DisplayName" xml:space="preserve">
     <value>Faalkans herstel van gefaalde situatie [1/jaar]</value>
   </data>
-  <data name="ClosingStructureFailureMechanismContextProperties_C_Description" xml:space="preserve">
+  <data name="ClosingStructuresFailureMechanismContextProperties_C_Description" xml:space="preserve">
     <value>De parameter 'C' die gebruikt wordt om het lengte-effect te berekenen.</value>
   </data>
-  <data name="ClosingStructureFailureMechanismContextProperties_C_DisplayName" xml:space="preserve">
+  <data name="ClosingStructuresFailureMechanismContextProperties_C_DisplayName" xml:space="preserve">
     <value>C [-]</value>
   </data>
-  <data name="ClosingStructureFailureMechanismContextProperties_N2A_Description" xml:space="preserve">
+  <data name="ClosingStructuresFailureMechanismContextProperties_N2A_Description" xml:space="preserve">
     <value>De parameter '2NA' die gebruikt wordt om het lengte-effect te berekenen.</value>
   </data>
-  <data name="ClosingStructureFailureMechanismContextProperties_N2A_DisplayName" xml:space="preserve">
+  <data name="ClosingStructuresFailureMechanismContextProperties_N2A_DisplayName" xml:space="preserve">
     <value>2NA [-]</value>
   </data>
 </root>
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailureMechanismProperties.cs
===================================================================
diff -u -rc53329fe1a36963d7e55abd8882b8eef43a685aa -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailureMechanismProperties.cs	(.../ClosingStructuresFailureMechanismProperties.cs)	(revision c53329fe1a36963d7e55abd8882b8eef43a685aa)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailureMechanismProperties.cs	(.../ClosingStructuresFailureMechanismProperties.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -53,8 +53,8 @@
 
         [PropertyOrder(cPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_LengthEffect")]
-        [ResourcesDisplayName(typeof(Resources), "ClosingStructureFailureMechanismContextProperties_C_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "ClosingStructureFailureMechanismContextProperties_C_Description")]
+        [ResourcesDisplayName(typeof(Resources), "ClosingStructuresFailureMechanismContextProperties_C_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "ClosingStructuresFailureMechanismContextProperties_C_Description")]
         public RoundedDouble C
         {
             get
@@ -65,8 +65,8 @@
 
         [PropertyOrder(n2APropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_LengthEffect")]
-        [ResourcesDisplayName(typeof(Resources), "ClosingStructureFailureMechanismContextProperties_N2A_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "ClosingStructureFailureMechanismContextProperties_N2A_Description")]
+        [ResourcesDisplayName(typeof(Resources), "ClosingStructuresFailureMechanismContextProperties_N2A_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "ClosingStructuresFailureMechanismContextProperties_N2A_Description")]
         public int N2A
         {
             get
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.ClosingStructures.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb4a21813310e188e65bffa91d101131cbd4e0d5b -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision b4a21813310e188e65bffa91d101131cbd4e0d5b)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -308,9 +308,9 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
-            {
-                new Point2D(0, 0)
-            }));
+                                                                    {
+                                                                        new Point2D(0, 0)
+                                                                    }));
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
@@ -350,9 +350,9 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
-            {
-                new Point2D(0, 0)
-            }));
+                                                                    {
+                                                                        new Point2D(0, 0)
+                                                                    }));
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             assessmentSectionStub.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -403,9 +403,9 @@
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
-            {
-                new Point2D(0, 0)
-            }));
+                                                                    {
+                                                                        new Point2D(0, 0)
+                                                                    }));
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
@@ -447,10 +447,10 @@
             observerMock.Expect(o => o.UpdateObserver());
 
             var section = new FailureMechanismSection("A", new[]
-            {
-                new Point2D(1, 2),
-                new Point2D(3, 4)
-            });
+                                                      {
+                                                          new Point2D(1, 2),
+                                                          new Point2D(3, 4)
+                                                      });
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
             failureMechanism.AddSection(section);
@@ -506,16 +506,16 @@
 
                     // Then
                     TestHelper.AssertLogMessages(action, messages =>
-                    {
-                        var msgs = messages.ToArray();
-                        Assert.AreEqual(6, msgs.Length);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' gestart om: ", (object) calculation.Name), msgs[0]);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' beëindigd om: ", (object) calculation.Name), msgs[1]);
-                        StringAssert.StartsWith(string.Format((string) "Berekening van '{0}' gestart om: ", (object) calculation.Name), msgs[2]);
-                        StringAssert.StartsWith("Betrouwbaarheid sluiting kunstwerk berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
-                        StringAssert.StartsWith(string.Format((string) "Berekening van '{0}' beëindigd om: ", (object) calculation.Name), msgs[4]);
-                        StringAssert.StartsWith(string.Format((string) "Uitvoeren van '{0}' is gelukt.", (object) calculation.Name), msgs[5]);
-                    });
+                                                 {
+                                                     var msgs = messages.ToArray();
+                                                     Assert.AreEqual(6, msgs.Length);
+                                                     StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                                                     StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                                                     StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
+                                                     StringAssert.StartsWith("Betrouwbaarheid sluiting kunstwerk berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
+                                                     StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]);
+                                                     StringAssert.StartsWith(string.Format("Uitvoeren van '{0}' is gelukt.", calculation.Name), msgs[5]);
+                                                 });
 
                     Assert.AreNotSame(initialOutput, calculation.Output);
                 }
@@ -529,10 +529,10 @@
             var observerMock = mocks.StrictMock<IObserver>();
 
             var section = new FailureMechanismSection("A", new[]
-            {
-                new Point2D(1, 2),
-                new Point2D(3, 4)
-            });
+                                                      {
+                                                          new Point2D(1, 2),
+                                                          new Point2D(3, 4)
+                                                      });
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
             failureMechanism.AddSection(section);
@@ -578,12 +578,12 @@
 
                     // Then
                     TestHelper.AssertLogMessages(action, messages =>
-                    {
-                        var msgs = messages.ToArray();
-                        Assert.AreEqual(2, msgs.Length);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' gestart om: ", (object) calculation.Name), msgs[0]);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' beëindigd om: ", (object) calculation.Name), msgs[1]);
-                    });
+                                                 {
+                                                     var msgs = messages.ToArray();
+                                                     Assert.AreEqual(2, msgs.Length);
+                                                     StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                                                     StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                                                 });
                 }
             }
         }
@@ -644,9 +644,9 @@
             group.Children.Add(elementToBeRemoved);
 
             failureMechanism.AddSection(new FailureMechanismSection("section", new[]
-            {
-                new Point2D(0, 0)
-            }));
+                                                                    {
+                                                                        new Point2D(0, 0)
+                                                                    }));
 
             ClosingStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First();
             result.Calculation = elementToBeRemoved;
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs
===================================================================
diff -u -r9ea9915bf83c70b481d4c58af0ae7e5866218766 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs	(.../DuneErosionFailureMechanismView.cs)	(revision 9ea9915bf83c70b481d4c58af0ae7e5866218766)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs	(.../DuneErosionFailureMechanismView.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -33,6 +33,9 @@
 
 namespace Ringtoets.DuneErosion.Forms.Views
 {
+    /// <summary>
+    /// This class is a view showing map data for a dune erosion failure mechanism.
+    /// </summary>
     public partial class DuneErosionFailureMechanismView : UserControl, IMapView
     {
         private readonly Observer failureMechanismObserver;
@@ -48,6 +51,9 @@
 
         private DuneErosionFailureMechanismContext data;
 
+        /// <summary>
+        /// Creates a new instance of <see cref="DuneErosionFailureMechanismView"/>.
+        /// </summary>
         public DuneErosionFailureMechanismView()
         {
             InitializeComponent();
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs
===================================================================
diff -u -ra4cd22ab000aa81906e43b5fd2898e52fee0e366 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs	(.../DuneErosionSectionResultRow.cs)	(revision a4cd22ab000aa81906e43b5fd2898e52fee0e366)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs	(.../DuneErosionSectionResultRow.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -40,7 +40,7 @@
         public DuneErosionSectionResultRow(DuneErosionFailureMechanismSectionResult sectionResult) : base(sectionResult) {}
 
         /// <summary>
-        /// Gets the assessment layer two a of the <see cref="Ringtoets.DuneErosion.Data.DuneErosionFailureMechanismSectionResult"/>.
+        /// Gets the assessment layer two a of the <see cref="DuneErosionFailureMechanismSectionResult"/>.
         /// </summary>
         public AssessmentLayerTwoAResult AssessmentLayerTwoA
         {
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Ringtoets.DuneErosion.Plugin.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Ringtoets.DuneErosion.Plugin.csproj	(.../Ringtoets.DuneErosion.Plugin.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Ringtoets.DuneErosion.Plugin.csproj	(.../Ringtoets.DuneErosion.Plugin.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -53,6 +53,7 @@
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
       <Project>{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}</Project>
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs
===================================================================
diff -u -r9ea9915bf83c70b481d4c58af0ae7e5866218766 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision 9ea9915bf83c70b481d4c58af0ae7e5866218766)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -34,6 +34,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
@@ -171,7 +172,7 @@
                 {
                     Locations =
                     {
-                        new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)
+                        new TestHydraulicBoundaryLocation()
                     }
                 };
 
@@ -272,7 +273,7 @@
                 {
                     Locations =
                     {
-                        new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0)
+                        new TestHydraulicBoundaryLocation()
                     }
                 };
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs
===================================================================
diff -u -r6af1173cfba5ef4f9fdf1db74c8feb892b87629f -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs	(.../DuneErosionPluginTest.cs)	(revision 6af1173cfba5ef4f9fdf1db74c8feb892b87629f)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs	(.../DuneErosionPluginTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -29,9 +29,8 @@
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
 using Ringtoets.DuneErosion.Forms.Views;
-using Ringtoets.DuneErosion.Plugin;
 
-namespace Ringtoets.DunErosion.Plugin.Test
+namespace Ringtoets.DuneErosion.Plugin.Test
 {
     [TestFixture]
     public class DuneErosionPluginTest
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneErosionFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r8509ce4290fff1f206f7bbd6eddedb37db28785b -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneErosionFailureMechanismPropertyInfoTest.cs	(.../DuneErosionFailureMechanismPropertyInfoTest.cs)	(revision 8509ce4290fff1f206f7bbd6eddedb37db28785b)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneErosionFailureMechanismPropertyInfoTest.cs	(.../DuneErosionFailureMechanismPropertyInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -27,9 +27,8 @@
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
 using Ringtoets.DuneErosion.Forms.PropertyClasses;
-using Ringtoets.DuneErosion.Plugin;
 
-namespace Ringtoets.DunErosion.Plugin.Test.PropertyInfos
+namespace Ringtoets.DuneErosion.Plugin.Test.PropertyInfos
 {
     [TestFixture]
     public class DuneErosionFailureMechanismPropertyInfoTest
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj
===================================================================
diff -u -r6af1173cfba5ef4f9fdf1db74c8feb892b87629f -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj	(.../Ringtoets.DuneErosion.Plugin.Test.csproj)	(revision 6af1173cfba5ef4f9fdf1db74c8feb892b87629f)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj	(.../Ringtoets.DuneErosion.Plugin.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -6,8 +6,8 @@
     <ProjectGuid>{BE3C9342-EC24-4D28-B2DD-E8C752A9CB9A}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Ringtoets.DunErosion.Plugin.Test</RootNamespace>
-    <AssemblyName>Ringtoets.DunErosion.Plugin.Test</AssemblyName>
+    <RootNamespace>Ringtoets.DuneErosion.Plugin.Test</RootNamespace>
+    <AssemblyName>Ringtoets.DuneErosion.Plugin.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6af1173cfba5ef4f9fdf1db74c8feb892b87629f -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6af1173cfba5ef4f9fdf1db74c8feb892b87629f)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -34,10 +34,9 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
-using Ringtoets.DuneErosion.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
-namespace Ringtoets.DunErosion.Plugin.Test.TreeNodeInfos
+namespace Ringtoets.DuneErosion.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
     public class DuneErosionFailureMechanismContextTreeNodeInfoTest
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -28,10 +28,9 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.DuneErosion.Data;
-using Ringtoets.DuneErosion.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
-namespace Ringtoets.DunErosion.Plugin.Test.TreeNodeInfos
+namespace Ringtoets.DuneErosion.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
     public class DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicBoundaryLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6af1173cfba5ef4f9fdf1db74c8feb892b87629f -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicBoundaryLocationsContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryLocationsContextTreeNodeInfoTest.cs)	(revision 6af1173cfba5ef4f9fdf1db74c8feb892b87629f)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicBoundaryLocationsContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryLocationsContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -33,10 +33,9 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
-using Ringtoets.DuneErosion.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
-namespace Ringtoets.DunErosion.Plugin.Test.TreeNodeInfos
+namespace Ringtoets.DuneErosion.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
     public class HydraulicBoundaryLocationsContextTreeNodeInfoTest
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r17803ed039cce7b596f325b6bdd03628ff333c03 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismResultViewInfoTest.cs	(.../DuneErosionFailureMechanismResultViewInfoTest.cs)	(revision 17803ed039cce7b596f325b6bdd03628ff333c03)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismResultViewInfoTest.cs	(.../DuneErosionFailureMechanismResultViewInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -31,10 +31,9 @@
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
 using Ringtoets.DuneErosion.Forms.Views;
-using Ringtoets.DuneErosion.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
-namespace Ringtoets.DunErosion.Plugin.Test.ViewInfos
+namespace Ringtoets.DuneErosion.Plugin.Test.ViewInfos
 {
     [TestFixture]
     public class DuneErosionFailureMechanismResultViewInfoTest
@@ -194,17 +193,17 @@
             // Setup
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var failureMechanism = new DuneErosionFailureMechanism();
-            var failureMechanismMock = mocks.Stub<FailureMechanismBase>("N", "C");
+            var failureMechanismStub = mocks.Stub<FailureMechanismBase>("N", "C");
 
             assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[]
             {
-                failureMechanismMock,
+                failureMechanismStub,
                 failureMechanism
             });
 
             mocks.ReplayAll();
 
-            using (var view = new DuneErosionFailureMechanismResultView())
+            using (var view = new DuneErosionFailureMechanismResultView()) 
             {
                 view.Data = failureMechanism.SectionResults;
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r2c595d68a6fb2abeebed64c607fa2a3ab806f483 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismViewInfoTest.cs	(.../DuneErosionFailureMechanismViewInfoTest.cs)	(revision 2c595d68a6fb2abeebed64c607fa2a3ab806f483)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismViewInfoTest.cs	(.../DuneErosionFailureMechanismViewInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -28,10 +28,9 @@
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
 using Ringtoets.DuneErosion.Forms.Views;
-using Ringtoets.DuneErosion.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
-namespace Ringtoets.DunErosion.Plugin.Test.ViewInfos
+namespace Ringtoets.DuneErosion.Plugin.Test.ViewInfos
 {
     [TestFixture]
     public class DuneErosionFailureMechanismViewInfoTest
@@ -80,6 +79,7 @@
 
                 // Assert
                 Assert.AreEqual(failureMechanism.Name, viewName);
+                mocks.VerifyAll();
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.GrassCoverErosionInwards.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj
===================================================================
diff -u -r9a001397536d9dcca5d009c8518478cdfcddbeca -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj)	(revision 9a001397536d9dcca5d009c8518478cdfcddbeca)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.GrassCoverErosionInwards.Plugin.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2b558b587da934f1088d35ec696ac5ab3bcedb81 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 2b558b587da934f1088d35ec696ac5ab3bcedb81)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -368,7 +368,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
@@ -523,7 +523,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2b558b587da934f1088d35ec696ac5ab3bcedb81 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2b558b587da934f1088d35ec696ac5ab3bcedb81)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -529,7 +529,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndexRootGroup];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2b558b587da934f1088d35ec696ac5ab3bcedb81 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2b558b587da934f1088d35ec696ac5ab3bcedb81)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -519,7 +519,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
@@ -676,7 +676,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.GrassCoverErosionOutwards.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -194,7 +192,6 @@
       <Name>Ringtoets.GrassCoverErosionOutwards.Service</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -68,7 +68,7 @@
 
             // Assert 
             CollectionAssert.AllItemsAreInstancesOfType(properties.Items, typeof(WaveConditionsOutputProperties));
-            Assert.AreEqual((int) items.Length, properties.Items.Length);
+            Assert.AreEqual(items.Length, properties.Items.Length);
 
             var firstOutput = items[0];
             var firstOutputProperties = properties.Items[0];
@@ -78,11 +78,11 @@
             Assert.AreEqual(firstOutput.WaveAngle, firstOutputProperties.WaveAngle);
             Assert.AreEqual(firstOutput.WaveDirection, firstOutputProperties.WaveDirection);
             Assert.AreEqual(ProbabilityFormattingHelper.Format(firstOutput.TargetProbability), firstOutputProperties.TargetProbability);
-            Assert.AreEqual((double) firstOutput.TargetReliability, (double) firstOutputProperties.TargetReliability,
-                            (double) firstOutputProperties.TargetReliability.GetAccuracy());
+            Assert.AreEqual(firstOutput.TargetReliability, firstOutputProperties.TargetReliability,
+                            firstOutputProperties.TargetReliability.GetAccuracy());
             Assert.AreEqual(ProbabilityFormattingHelper.Format(firstOutput.CalculatedProbability), firstOutputProperties.CalculatedProbability);
-            Assert.AreEqual((double) firstOutput.TargetReliability, (double) firstOutputProperties.TargetReliability,
-                            (double) firstOutputProperties.TargetReliability.GetAccuracy());
+            Assert.AreEqual(firstOutput.TargetReliability, firstOutputProperties.TargetReliability,
+                            firstOutputProperties.TargetReliability.GetAccuracy());
 
             string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(firstOutput.CalculationConvergence).DisplayName;
             Assert.AreEqual(convergenceValue, firstOutputProperties.Convergence);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.GrassCoverErosionOutwards.Plugin.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -372,11 +371,11 @@
                         Assert.AreEqual(testDataPath, testDesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory);
                         Assert.AreEqual(assessmentSectionStub.Id, testDesignWaterLevelCalculator.RingId);
 
-                        Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, (long) designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
+                        Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
                         var expectedProbability = assessmentSectionStub.FailureMechanismContribution.Norm
                                                   *(failureMechanism.Contribution/100)/
                                                   failureMechanism.GeneralInput.N;
-                        Assert.AreEqual((object) StatisticsConverter.ProbabilityToReliability(expectedProbability), designWaterLevelCalculationInput.Beta);
+                        Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(expectedProbability), designWaterLevelCalculationInput.Beta);
                     }
                 }
             }
@@ -440,8 +439,8 @@
                         Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation1.DesignWaterLevel); // No result set
 
                         // Previous result not cleared
-                        Assert.AreEqual((double) designWaterLevel, (double) grassCoverErosionOutwardsHydraulicBoundaryLocation2.DesignWaterLevel,
-                                        (double) grassCoverErosionOutwardsHydraulicBoundaryLocation2.DesignWaterLevel.GetAccuracy());
+                        Assert.AreEqual(designWaterLevel, grassCoverErosionOutwardsHydraulicBoundaryLocation2.DesignWaterLevel,
+                                        grassCoverErosionOutwardsHydraulicBoundaryLocation2.DesignWaterLevel.GetAccuracy());
                     }
                 }
             }
@@ -505,8 +504,8 @@
                             StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is gelukt.",
                                                                                hydraulicBoundaryLocation.Name), msgs[6]);
                         });
-                        Assert.AreEqual((double) 0, (double) hydraulicBoundaryLocation.DesignWaterLevel,
-                                        (double) hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
+                        Assert.AreEqual(0, hydraulicBoundaryLocation.DesignWaterLevel,
+                                        hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
                         Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
                     }
                 }
@@ -559,7 +558,7 @@
                         TestHelper.AssertLogMessageIsGenerated(action, "De bijdrage van dit toetsspoor is nul. Daardoor is de doorsnede-eis onbepaald en kunnen de berekeningen niet worden uitgevoerd.");
 
                         var testDesignWaterLevelCalculator = testFactory.DesignWaterLevelCalculator;
-                        Assert.IsEmpty((IEnumerable) testDesignWaterLevelCalculator.ReceivedInputs);
+                        Assert.IsEmpty(testDesignWaterLevelCalculator.ReceivedInputs);
 
                         Assert.IsNullOrEmpty(testDesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory);
                         Assert.IsNullOrEmpty(testDesignWaterLevelCalculator.RingId);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -401,11 +401,11 @@
                         Assert.AreEqual(testDataPath, testWaveHeightCalculator.HydraulicBoundaryDatabaseDirectory);
                         Assert.AreEqual(assessmentSectionStub.Id, testWaveHeightCalculator.RingId);
 
-                        Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, (long) waveHeightCalculationInput.HydraulicBoundaryLocationId);
+                        Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId);
                         var expectedProbability = assessmentSectionStub.FailureMechanismContribution.Norm
                                                   *(failureMechanism.Contribution/100)
                                                   /failureMechanism.GeneralInput.N;
-                        Assert.AreEqual((object) StatisticsConverter.ProbabilityToReliability(expectedProbability), waveHeightCalculationInput.Beta);
+                        Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(expectedProbability), waveHeightCalculationInput.Beta);
                     }
                 }
             }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.HeightStructures.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj	(.../Ringtoets.HeightStructures.Plugin.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj	(.../Ringtoets.HeightStructures.Plugin.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.HeightStructures.Plugin.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc4f859b931595013937ea8f7ff31b34b87fc0999 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c4f859b931595013937ea8f7ff31b34b87fc0999)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -361,7 +361,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
@@ -519,7 +519,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
@@ -646,12 +646,12 @@
                     {
                         var msgs = messages.ToArray();
                         Assert.AreEqual(6, msgs.Length);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' gestart om: ", (object) calculation.Name), msgs[0]);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' beëindigd om: ", (object) calculation.Name), msgs[1]);
-                        StringAssert.StartsWith(string.Format((string) "Berekening van '{0}' gestart om: ", (object) calculation.Name), msgs[2]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                        StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
                         StringAssert.StartsWith("Hoogte kunstwerk berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
-                        StringAssert.StartsWith(string.Format((string) "Berekening van '{0}' beëindigd om: ", (object) calculation.Name), msgs[4]);
-                        StringAssert.StartsWith(string.Format((string) "Uitvoeren van '{0}' is gelukt.", (object) calculation.Name), msgs[5]);
+                        StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]);
+                        StringAssert.StartsWith(string.Format("Uitvoeren van '{0}' is gelukt.", calculation.Name), msgs[5]);
                     });
 
                     Assert.AreNotSame(initialOutput, calculation.Output);
@@ -719,8 +719,8 @@
                     {
                         var msgs = messages.ToArray();
                         Assert.AreEqual(2, msgs.Length);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' gestart om: ", (object) calculation.Name), msgs[0]);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' beëindigd om: ", (object) calculation.Name), msgs[1]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
                     });
                 }
             }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc4f859b931595013937ea8f7ff31b34b87fc0999 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c4f859b931595013937ea8f7ff31b34b87fc0999)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -525,7 +525,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
@@ -683,7 +683,7 @@
                     ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
 
                     Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text);
-                    StringAssert.Contains(string.Format((string) RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image);
                     Assert.IsFalse(contextMenuItem.Enabled);
                 }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.Integration.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -216,7 +214,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -186,7 +186,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.StabilityPointStructures.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -148,7 +146,6 @@
       <Name>Ringtoets.StabilityPointStructures.Data.TestUtil</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/Ringtoets.StabilityPointStructures.Plugin.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/Ringtoets.StabilityPointStructures.Plugin.Test.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/Ringtoets.StabilityPointStructures.Plugin.Test.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.StabilityPointStructures.Plugin.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2c460af2b6943d5420db614055c0bf2e67667c8c -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 2c460af2b6943d5420db614055c0bf2e67667c8c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -507,12 +507,12 @@
                     {
                         var msgs = messages.ToArray();
                         Assert.AreEqual(6, msgs.Length);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' gestart om: ", (object) calculation.Name), msgs[0]);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' beëindigd om: ", (object) calculation.Name), msgs[1]);
-                        StringAssert.StartsWith(string.Format((string) "Berekening van '{0}' gestart om: ", (object) calculation.Name), msgs[2]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                        StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
                         StringAssert.StartsWith("Puntconstructies berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
-                        StringAssert.StartsWith(string.Format((string) "Berekening van '{0}' beëindigd om: ", (object) calculation.Name), msgs[4]);
-                        StringAssert.StartsWith(string.Format((string) "Uitvoeren van '{0}' is gelukt.", (object) calculation.Name), msgs[5]);
+                        StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]);
+                        StringAssert.StartsWith(string.Format("Uitvoeren van '{0}' is gelukt.", calculation.Name), msgs[5]);
                     });
 
                     Assert.AreNotSame(initialOutput, calculation.Output);
@@ -581,8 +581,8 @@
                     {
                         var msgs = messages.ToArray();
                         Assert.AreEqual(2, msgs.Length);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' gestart om: ", (object) calculation.Name), msgs[0]);
-                        StringAssert.StartsWith(string.Format((string) "Validatie van '{0}' beëindigd om: ", (object) calculation.Name), msgs[1]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
                     });
                 }
             }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj	(.../Ringtoets.StabilityStoneCover.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj	(.../Ringtoets.StabilityStoneCover.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.StabilityStoneCover.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/Ringtoets.StabilityStoneCover.Plugin.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/Ringtoets.StabilityStoneCover.Plugin.Test.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/Ringtoets.StabilityStoneCover.Plugin.Test.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.StabilityStoneCover.Plugin.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.WaveImpactAsphaltCover.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb9a59dd5f30c8de46d0cabb4e1609c09176a4246
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision b9a59dd5f30c8de46d0cabb4e1609c09176a4246)
@@ -10,8 +10,6 @@
     <AssemblyName>Ringtoets.WaveImpactAsphaltCover.Plugin.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>