Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructureContext.cs
===================================================================
diff -u -rcd4c32e6c897ceff2c5ae483e3bfb586ab9b6598 -r84839b3ebb20766ad68c4de6bc77e987b62bc7c9
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructureContext.cs	(.../HeightStructureContext.cs)	(revision cd4c32e6c897ceff2c5ae483e3bfb586ab9b6598)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructureContext.cs	(.../HeightStructureContext.cs)	(revision 84839b3ebb20766ad68c4de6bc77e987b62bc7c9)
@@ -33,11 +33,11 @@
     public class HeightStructureContext : ObservableWrappedObjectContextBase<ObservableList<HeightStructure>>
     {
         /// <summary>
-        /// 
+        /// Creates an instance of <see cref="HeightStructureContext"/>
         /// </summary>
-        /// <param name="heightStructures"></param>
-        /// <param name="assessmentSection"></param>
-        /// <exception cref="ArgumentNullException"></exception>
+        /// <param name="heightStructures">The collection to update</param>
+        /// <param name="assessmentSection">The assessment section</param>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input arguments are null</exception>
         public HeightStructureContext(ObservableList<HeightStructure> heightStructures, IAssessmentSection assessmentSection)
             : base(heightStructures)
         {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructureContextTest.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructureContextTest.cs	(revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructureContextTest.cs	(revision 84839b3ebb20766ad68c4de6bc77e987b62bc7c9)
@@ -0,0 +1,70 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.HeightStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class HeightStructureContextTest
+    {
+        [Test]
+        public void ParameteredConstructor_DefaultValues()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var heightStructureProfiles = new ObservableList<HeightStructure>();
+
+            // Call
+            var context = new HeightStructureContext(heightStructureProfiles, assessmentSectionMock);
+
+            // Assert
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ObservableList<HeightStructure>>>(context);
+            Assert.AreSame(heightStructureProfiles, context.WrappedData);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ParameteredConstructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var heightStructureProfiles = new ObservableList<HeightStructure>();
+
+            // Call
+            TestDelegate test = () => new HeightStructureContext(heightStructureProfiles, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 84839b3ebb20766ad68c4de6bc77e987b62bc7c9 refers to a dead (removed) revision in file `Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructureProfileContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj
===================================================================
diff -u -rcd4c32e6c897ceff2c5ae483e3bfb586ab9b6598 -r84839b3ebb20766ad68c4de6bc77e987b62bc7c9
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision cd4c32e6c897ceff2c5ae483e3bfb586ab9b6598)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision 84839b3ebb20766ad68c4de6bc77e987b62bc7c9)
@@ -61,7 +61,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="PresentationObjects\HeightStructureProfileContextTest.cs" />
+    <Compile Include="PresentationObjects\HeightStructureContextTest.cs" />
     <Compile Include="PresentationObjects\HeightStructuresCalculationContextTest.cs" />
     <Compile Include="PresentationObjects\HeightStructuresCalculationGroupContextTest.cs" />
     <Compile Include="PresentationObjects\HeightStructuresContextTest.cs" />
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r84839b3ebb20766ad68c4de6bc77e987b62bc7c9
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 84839b3ebb20766ad68c4de6bc77e987b62bc7c9)
@@ -82,9 +82,9 @@
                 Name = PipingFormsResources.PipingSurfaceLinesCollection_DisplayName,
                 Category = RingtoetsCommonFormsResources.Ringtoets_Category,
                 Image = PipingFormsResources.PipingSurfaceLineIcon,
-                FileFilter = string.Format("{0} {1} (*.csv)|*.csv",
+                FileFilter = string.Format("{0} {1}",
                                            PipingFormsResources.PipingSurfaceLinesCollection_DisplayName,
-                                           PipingPluginResources.Csv_file_name),
+                                          RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter),
                 IsEnabled = context => context.AssessmentSection.ReferenceLine != null,
                 CreateFileImporter = (context, filePath) => new PipingSurfaceLinesCsvImporter(context.WrappedData,
                                                                                               context.AssessmentSection.ReferenceLine,
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -r84839b3ebb20766ad68c4de6bc77e987b62bc7c9
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cbe47edc5aec1175bceda95452ebe5697eda181d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 84839b3ebb20766ad68c4de6bc77e987b62bc7c9)
@@ -82,15 +82,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kommagescheiden bestand.
-        /// </summary>
-        public static string Csv_file_name {
-            get {
-                return ResourceManager.GetString("Csv_file_name", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Het stochastische ondergrondmodel &apos;{0}&apos; bestaat al in het toetsspoor..
         /// </summary>
         public static string PipingSoilProfilesImporter_AddImportedDataToModel_Stochastisch_soil_model_0_already_exists {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx
===================================================================
diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -r84839b3ebb20766ad68c4de6bc77e987b62bc7c9
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision cbe47edc5aec1175bceda95452ebe5697eda181d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 84839b3ebb20766ad68c4de6bc77e987b62bc7c9)
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Csv_file_name" xml:space="preserve">
-    <value>Kommagescheiden bestand</value>
-  </data>
   <data name="Soil_file_name" xml:space="preserve">
     <value>D-Soil Model bestand</value>
   </data>