Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/RingtoetsDatabaseCreatorTest.cs
===================================================================
diff -u -r4e65fa5d8abdf1c0a9238492cdbcd7d2b3fa2d0f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/RingtoetsDatabaseCreatorTest.cs	(.../RingtoetsDatabaseCreatorTest.cs)	(revision 4e65fa5d8abdf1c0a9238492cdbcd7d2b3fa2d0f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/RingtoetsDatabaseCreatorTest.cs	(.../RingtoetsDatabaseCreatorTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -31,7 +31,7 @@
     [Explicit]
     public class RingtoetsDatabaseCreatorTest
     {
-        private static readonly string pathToStorageProject = Path.Combine(TestHelper.TestDataDirectory, "Application", "Ringtoets", "src", "Application.Ringtoets.Storage");
+        private static readonly string pathToStorageProject = Path.Combine(Path.GetDirectoryName(TestHelper.SolutionRoot), "Application", "Ringtoets", "src", "Application.Ringtoets.Storage");
 
         /// <summary>
         /// Creates a new Ringtoets.rtd file in the root of the <see cref="Application.Ringtoets.Storage"/>, 
Index: Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs
===================================================================
diff -u -r1d86c8daf73d71b72c7a105b5f564ae7480a8d7f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs	(.../StorageCommandHandler.cs)	(revision 1d86c8daf73d71b72c7a105b5f564ae7480a8d7f)
+++ Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs	(.../StorageCommandHandler.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -60,7 +60,7 @@
         public bool ContinueIfHasChanges()
         {
             var project = projectOwner.Project;
-            if (project == null || projectOwner.EqualsToNew(project))
+            if (project == null || projectOwner.IsCurrentNew())
             {
                 return true;
             }
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs
===================================================================
diff -u -rf7b5ed585321bbc2249ec9c8ecd8af7f9eb1808a -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs	(.../IMainWindow.cs)	(revision f7b5ed585321bbc2249ec9c8ecd8af7f9eb1808a)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs	(.../IMainWindow.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -21,8 +21,6 @@
 
 using System.Windows.Forms;
 using Core.Common.Controls.Views;
-using Core.Common.Gui.Forms.MessageWindow;
-using Core.Common.Gui.Forms.ViewHost;
 
 namespace Core.Common.Gui.Forms.MainWindow
 {
@@ -32,61 +30,11 @@
     public interface IMainWindow : IWin32Window
     {
         /// <summary>
-        /// Gets the view host.
-        /// </summary>
-        IViewHost ViewHost { get; }
-
-        /// <summary>
         /// Gets the property grid tool window.
         /// </summary>
         IView PropertyGrid { get; }
 
         /// <summary>
-        /// Gets the log messages tool window.
-        /// </summary>
-        IMessageWindow MessageWindow { get; }
-
-        /// <summary>
-        /// Gets or sets the title of the main user interface.
-        /// </summary>
-        string Title { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether or not the main user interface is visible.
-        /// </summary>
-        bool Visible { get; }
-
-        /// <summary>
-        /// Gets or sets the status bar text.
-        /// </summary>
-        string StatusBarMessage { get; set; }
-
-        /// <summary>
-        /// Shows main user interface.
-        /// </summary>
-        void Show();
-
-        /// <summary>
-        /// Closes main user interface, shutting it down.
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// Updates the state of the child controls of the main user interface.
-        /// </summary>
-        void ValidateItems();
-
-        /// <summary>
-        /// Changes the cursor to display a 'waiting' or 'busy' state.
-        /// </summary>
-        void SetWaitCursorOn();
-
-        /// <summary>
-        /// Changes the cursor to display the default cursor.
-        /// </summary>
-        void SetWaitCursorOff();
-
-        /// <summary>
         /// Initializes and shows the property grid tool window.
         /// </summary>
         void InitPropertiesWindowAndActivate();
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -rb6d263f3f919ce64e84f4031b94a19e0995f202c -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision b6d263f3f919ce64e84f4031b94a19e0995f202c)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -131,14 +131,5 @@
 
         <viewHost:AvalonDockViewHost Grid.Row="1" x:Name="avalonDockViewHost" />
 
-        <fluent:StatusBar HorizontalAlignment="Stretch"
-                        VerticalAlignment="Bottom"
-                        Grid.Row="2">
-
-            <fluent:StatusBarItem HorizontalAlignment="Left" Title="{x:Static Properties:Resources.Ribbon_StatusBar_Status_text}">
-                <TextBlock x:Name="StatusMessageTextBlock" Text="" />
-            </fluent:StatusBarItem>
-            
-        </fluent:StatusBar>
     </Grid>
 </fluent:RibbonWindow>
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r6195c365f8d9685719b4a9bd73685d04ca917d6e -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 6195c365f8d9685719b4a9bd73685d04ca917d6e)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -98,6 +98,9 @@
         /// </summary>
         public bool IsWindowDisposed { get; private set; }
 
+        /// <summary>
+        /// Gets the log messages tool window.
+        /// </summary>
         public IMessageWindow MessageWindow
         {
             get
@@ -106,6 +109,9 @@
             }
         }
 
+        /// <summary>
+        /// Gets the view host.
+        /// </summary>
         public IViewHost ViewHost
         {
             get
@@ -152,18 +158,6 @@
             }
         }
 
-        public string StatusBarMessage
-        {
-            get
-            {
-                return StatusMessageTextBlock.Text;
-            }
-            set
-            {
-                StatusMessageTextBlock.Text = value;
-            }
-        }
-
         public IView PropertyGrid
         {
             get
@@ -310,26 +304,8 @@
             {
                 ribbonCommandHandler.ValidateItems();
             }
-
-            foreach (var ribbonGroupBox in Ribbon.Tabs.SelectMany(tab => tab.Groups))
-            {
-                // Colapse all groups without visible items
-                ribbonGroupBox.Visibility = ribbonGroupBox.Items.OfType<UIElement>().All(e => e.Visibility == Visibility.Collapsed || e is Separator)
-                                                ? Visibility.Collapsed
-                                                : Visibility.Visible;
-            }
         }
 
-        public void SetWaitCursorOn()
-        {
-            Mouse.OverrideCursor = Cursors.Wait;
-        }
-
-        public void SetWaitCursorOff()
-        {
-            Mouse.OverrideCursor = null;
-        }
-
         private void OnActiveDocumentViewChanging(object sender, EventArgs e)
         {
             if (Ribbon.SelectedTabItem != null && !Ribbon.SelectedTabItem.IsContextual)
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs
===================================================================
diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(.../IMessageWindow.cs)	(revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(.../IMessageWindow.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -37,10 +37,5 @@
         /// <param name="time">Time when the message was logged.</param>
         /// <param name="message">The message text.</param>
         void AddMessage(Level level, DateTime time, string message);
-
-        /// <summary>
-        /// Clears all messages in the view.
-        /// </summary>
-        void Clear();
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -r6b177b1cf76ce7edd18cddc0f96acd88f90d8a2d -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 6b177b1cf76ce7edd18cddc0f96acd88f90d8a2d)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -185,7 +185,7 @@
 
         private void ButtonClearAllClick(object sender, EventArgs e)
         {
-            Clear();
+            Messages.Clear();
         }
 
         private void ButtonCopyClick(object sender, EventArgs e)
@@ -290,11 +290,6 @@
             Invalidate();
         }
 
-        public void Clear()
-        {
-            Messages.Clear();
-        }
-
         #endregion
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs
===================================================================
diff -u -r652b03cb8115830641e05bffb356bcf5779bc9f0 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs	(.../SelectViewDialog.cs)	(revision 652b03cb8115830641e05bffb356bcf5779bc9f0)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs	(.../SelectViewDialog.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -70,18 +70,14 @@
         }
 
         /// <summary>
-        /// Gets or sets the selected item.
+        /// Gets the selected item.
         /// </summary>
         public string SelectedItem
         {
             get
             {
                 return (string) listBox.SelectedItem;
             }
-            set
-            {
-                listBox.SelectedItem = value;
-            }
         }
 
         /// <summary>
Index: Core/Common/src/Core.Common.Gui/GuiCore.cs
===================================================================
diff -u -r92ce91281efab19772bd3e2d7ecea2c0a6c8ea97 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision 92ce91281efab19772bd3e2d7ecea2c0a6c8ea97)
+++ Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -141,13 +141,13 @@
             Dispose(true);
         }
 
-        public void Run()
+        /// <summary>
+        /// Runs the user interface, causing all user interface components to initialize, 
+        /// loading plugins, opening a saved project and displaying the main window.
+        /// </summary>
+        /// <param name="projectPath">Path to the project to be opened. (optional)</param>
+        public void Run(string projectPath = null)
         {
-            Run(null);
-        }
-
-        public void Run(string projectPath)
-        {
             var startTime = DateTime.Now;
 
             ConfigureLogging();
@@ -183,9 +183,6 @@
 
             isExiting = true;
 
-            // close faster (hide main window)
-            mainWindow.Visible = false;
-
             if (Application.Current != null)
             {
                 Application.Current.Shutdown();
@@ -375,19 +372,14 @@
             Plugins.Remove(plugin);
         }
 
-        private void ResumeUI()
+        private void ApplicationProjectOpened(IProject newProject)
         {
             if (mainWindow != null)
             {
                 mainWindow.ValidateItems();
             }
         }
 
-        private void ApplicationProjectOpened(IProject newProject)
-        {
-            ResumeUI();
-        }
-
         private void ConfigureLogging()
         {
             // configure logging
@@ -586,7 +578,7 @@
             }
         }
 
-        public bool EqualsToNew(IProject other)
+        public bool IsCurrentNew()
         {
             return Project != null && Project.Equals(projectFactory.CreateNewProject());
         }
Index: Core/Common/src/Core.Common.Gui/IGui.cs
===================================================================
diff -u -r1eed3e3f652618c52a462edc502cfd4250772314 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision 1eed3e3f652618c52a462edc502cfd4250772314)
+++ Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -41,21 +41,8 @@
         /// instance for a given data object for the application to use.
         /// </summary>
         IPropertyResolver PropertyResolver { get; }
-
+        
         /// <summary>
-        /// Runs the user interface, causing all user interface components to initialize, 
-        /// loading plugins and displaying the main window.
-        /// </summary>
-        void Run();
-
-        /// <summary>
-        /// Runs the user interface, causing all user interface components to initialize, 
-        /// loading plugins, opening a saved project and displaying the main window.
-        /// </summary>
-        /// <param name="projectPath">Path to the project to be opened.</param>
-        void Run(string projectPath);
-
-        /// <summary>
         /// Terminates the application.
         /// </summary>
         void Exit();
Index: Core/Common/src/Core.Common.Gui/IProjectOwner.cs
===================================================================
diff -u -r1eed3e3f652618c52a462edc502cfd4250772314 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Gui/IProjectOwner.cs	(.../IProjectOwner.cs)	(revision 1eed3e3f652618c52a462edc502cfd4250772314)
+++ Core/Common/src/Core.Common.Gui/IProjectOwner.cs	(.../IProjectOwner.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -45,11 +45,10 @@
         string ProjectFilePath { get; set; }
 
         /// <summary>
-        /// Indicates whether the current <see cref="IProjectOwner.Project"/> is equal to <paramref name="other"/>.
+        /// Indicates whether the current <see cref="IProjectOwner.Project"/> is a new project.
         /// </summary>
-        /// <param name="other">The <see cref="IProject"/> to compare with <see cref="IProjectOwner.Project"/>.</param>
-        /// <returns><c>true</c> if <see cref="IProjectOwner.Project"/> is equal to <paramref name="other"/>; <c>false</c> otherwise.</returns>
-        bool EqualsToNew(IProject other);
+        /// <returns><c>true</c> if <see cref="IProjectOwner.Project"/> is equal to a new project, <c>false</c> otherwise.</returns>
+        bool IsCurrentNew();
 
         /// <summary>
         /// Creates a new <see cref="IProject"/>.
Index: Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs	(.../AssemblyUtils.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs	(.../AssemblyUtils.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -33,8 +33,6 @@
     /// </summary>
     public static class AssemblyUtils
     {
-        private static readonly ILog log = LogManager.GetLogger(typeof(AssemblyUtils));
-
         /// <summary>
         /// Return attributes for a specific assembly
         /// </summary>
Index: Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs
===================================================================
diff -u -rc312034c7478db99d3c2ef96b1c351df806e8d21 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision c312034c7478db99d3c2ef96b1c351df806e8d21)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -86,7 +86,7 @@
             projectOwner.Project = projectMock;
             projectOwner.ProjectFilePath = savedProjectPath;
             projectOwner.Expect(po => po.CreateNewProject());
-            projectOwner.Expect(po => po.EqualsToNew(projectMock)).Return(true);
+            projectOwner.Expect(po => po.IsCurrentNew()).Return(true);
             projectOwner.Expect(po => po.CloseProject());
 
             var mainWindowController = mocks.Stub<IWin32Window>();
Index: Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs
===================================================================
diff -u -rf7b5ed585321bbc2249ec9c8ecd8af7f9eb1808a -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision f7b5ed585321bbc2249ec9c8ecd8af7f9eb1808a)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -75,8 +75,6 @@
                 Assert.IsNull(mainWindow.MessageWindow);
                 Assert.IsNull(mainWindow.PropertyGrid);
 
-                Assert.AreEqual(string.Empty, mainWindow.StatusBarMessage);
-
                 Assert.IsNotNull(mainWindow.Handle);
                 Assert.IsFalse(mainWindow.InvokeRequired,
                                "'mainWindow' instance on same thread as test, therefore invocation not required.");
@@ -184,23 +182,6 @@
 
         [Test]
         [STAThread]
-        public void StatusBarMessage_SetValue_ReturnNewlySetValue()
-        {
-            // Setup
-            const string message = "<some message>";
-            using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
-            {
-                // Call
-                mainWindow.StatusBarMessage = message;
-
-                // Assert
-                Assert.AreEqual(message, TypeUtils.GetField<TextBlock>(mainWindow, "StatusMessageTextBlock").Text);
-                Assert.AreEqual(message, mainWindow.StatusBarMessage);
-            }
-        }
-
-        [Test]
-        [STAThread]
         public void SubscribeToGui_NoGuiSet_DoNothing()
         {
             // Setup
@@ -436,55 +417,5 @@
             }
             mocks.VerifyAll();
         }
-
-        [Test]
-        [STAThread]
-        public void SetWaitCursorOn_SetMouseOverrideToWait()
-        {
-            // Setup
-            Cursor originalValue = Mouse.OverrideCursor;
-
-            try
-            {
-                using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
-                {
-                    // Call
-                    mainWindow.SetWaitCursorOn();
-
-                    // Assert
-                    Assert.AreEqual(Cursors.Wait, Mouse.OverrideCursor);
-                }
-            }
-            finally
-            {
-                Mouse.OverrideCursor = originalValue;
-            }
-        }
-
-        [Test]
-        [STAThread]
-        public void SetWaitCursorOff_SetMouseOverrideToNull()
-        {
-            // Setup
-            Cursor originalValue = Mouse.OverrideCursor;
-
-            try
-            {
-                using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
-                {
-                    mainWindow.SetWaitCursorOn();
-
-                    // Call
-                    mainWindow.SetWaitCursorOff();
-
-                    // Assert
-                    Assert.IsNull(Mouse.OverrideCursor);
-                }
-            }
-            finally
-            {
-                Mouse.OverrideCursor = originalValue;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -168,10 +168,10 @@
             var guiCoreSettings = new GuiCoreSettings();
 
             using (var mainWindow = new MainWindow())
-            using (var gui = new GuiCore(mainWindow, projectStore, projectFactory, guiCoreSettings))
+            using (new GuiCore(mainWindow, projectStore, projectFactory, guiCoreSettings))
 
             // Call
-            using (var gui2 = new GuiCore(mainWindow, projectStore, projectFactory, guiCoreSettings))
+            using (new GuiCore(mainWindow, projectStore, projectFactory, guiCoreSettings))
 
             // Assert
             mocks.VerifyAll();
Index: Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs	(.../SqLiteDatabaseReaderBaseTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs	(.../SqLiteDatabaseReaderBaseTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -45,7 +45,7 @@
             var uncPath = Path.Combine(@"\\localhost\c$", fileName);
 
             // Call
-            using (var fileDisposeHelper = new FileDisposeHelper(localPath))
+            using (new FileDisposeHelper(localPath))
             {
                 using (var reader = new TestReader(uncPath))
                 {
Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs
===================================================================
diff -u -r58e275211395fc690df2706ccdaff082ecf7b544 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision 58e275211395fc690df2706ccdaff082ecf7b544)
+++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -83,21 +83,6 @@
         }
 
         [Test]
-        public void TestDataDirectory()
-        {
-            var dir = TestHelper.TestDataDirectory;
-            Assert.IsTrue(Directory.Exists(dir));
-        }
-
-        [Test]
-        public void GetFullPathForTestFile()
-        {
-            Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), ".."));
-            string fullPath = TestHelper.GetTestFilePath("Test.txt");
-            Assert.IsTrue(File.Exists(fullPath));
-        }
-
-        [Test]
         public void GetTestDataPath_Always_VerifiedTestPaths()
         {
             string path;
Index: Core/Common/test/Core.Common.TestUtil/LogHelper.cs
===================================================================
diff -u -rde4477561032a5d95d5e65e50b719724466648ed -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/test/Core.Common.TestUtil/LogHelper.cs	(.../LogHelper.cs)	(revision de4477561032a5d95d5e65e50b719724466648ed)
+++ Core/Common/test/Core.Common.TestUtil/LogHelper.cs	(.../LogHelper.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using log4net;
-using log4net.Config;
 using log4net.Core;
 using log4net.Repository.Hierarchy;
 
@@ -56,16 +55,6 @@
         }
 
         /// <summary>
-        /// Configures logging. In case of log4net reads log4net section from app.config file.
-        /// </summary>
-        public static void ConfigureLogging(Level level = null)
-        {
-            ResetLogging();
-            BasicConfigurator.Configure();
-            SetLoggingLevel(level ?? Level.Error);
-        }
-
-        /// <summary>
         /// Resets logging configuration, no log messages are sent after that.
         /// </summary>
         public static void ResetLogging()
Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u -r4851d9c2b000de0707f6cce0872979ecc1e3dead -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 4851d9c2b000de0707f6cce0872979ecc1e3dead)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -26,7 +26,6 @@
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Windows.Forms;
 using log4net.Appender;
 using log4net.Config;
@@ -51,100 +50,28 @@
             }
         }
 
-        //TODO: Replace this property
-        public static string TestDataDirectory
-        {
-            get
-            {
-                return Path.GetDirectoryName(SolutionRoot);
-            }
-        }
-
-        public static string GetCurrentMethodName()
-        {
-            MethodBase callingMethod = new StackFrame(1, false).GetMethod();
-            return callingMethod.DeclaringType.Name + "." + callingMethod.Name;
-        }
-
         /// <summary>
-        /// Returns full path to the file or directory in "test-data"
+        /// Returns a full path to a test data directory given the <paramref name="testDataPath"/>.
         /// </summary>
-        /// <param name="testDataPath"></param>
-        /// <returns></returns>
+        /// <param name="testDataPath">The path to construct a full test data path for.</param>
+        /// <returns>A full path to the test data.</returns>
         public static string GetTestDataPath(TestDataPath testDataPath)
         {
-            return Path.Combine(TestDataDirectory, testDataPath.Path, "test-data");
+            return Path.Combine(Path.GetDirectoryName(SolutionRoot), testDataPath.Path, "test-data");
         }
 
         /// <summary>
-        /// Returns full path to the file or directory in "test-data"
+        /// Returns a full path to a file or directory in the test data directory.
         /// </summary>
-        /// <param name="testDataPath"></param>
-        /// <param name="path"></param>
-        /// <returns></returns>
+        /// <param name="testDataPath">The path to construct a full test data path for.</param>
+        /// <param name="path">The path to a file or directory in the test data directory.</param>
+        /// <returns>A full path to the file or directory from the test data directory.</returns>
         public static string GetTestDataPath(TestDataPath testDataPath, string path)
         {
             return Path.Combine(GetTestDataPath(testDataPath.Path), path);
         }
 
-        public static string GetTestProjectDirectory()
-        {
-            var stackFrames = new StackTrace().GetFrames();
-            if (stackFrames == null)
-            {
-                throw new Exception("Could not get stacktrace.");
-            }
-
-            var testMethod = stackFrames.FirstOrDefault(f => f.GetMethod().GetCustomAttributes(typeof(TestAttribute), true).Any() ||
-                                                             f.GetMethod().GetCustomAttributes(typeof(SetUpAttribute), true).Any() ||
-                                                             f.GetMethod().GetCustomAttributes(typeof(TestFixtureSetUpAttribute), true).Any());
-
-            if (testMethod == null)
-            {
-                throw new Exception("Could not determine the test method.");
-            }
-
-            var testClassType = testMethod.GetMethod().DeclaringType;
-            if (testClassType == null)
-            {
-                throw new Exception("Could not find test class type.");
-            }
-
-            return Path.GetDirectoryName((new Uri(testClassType.Assembly.CodeBase)).AbsolutePath);
-        }
-
         /// <summary>
-        /// Gets the test-data directory for the current test project.
-        /// </summary>
-        public static string GetDataDir()
-        {
-            var testProjectDirectory = GetTestProjectDirectory();
-            var rootedTestProjectFolderPath = Path.GetFullPath(Path.Combine(testProjectDirectory, "..", ".."));
-
-            return Path.GetFullPath(Path.Combine(rootedTestProjectFolderPath, "test-data") + Path.DirectorySeparatorChar);
-        }
-
-        /// <summary>
-        /// Get's the path in test-data tree section
-        /// </summary>
-        /// <param name="filename"></param>
-        /// <returns></returns>
-        public static string GetTestFilePath(string filename)
-        {
-            var path = Path.Combine(GetDataDir(), filename);
-            var uri = new UriBuilder(path);
-
-            path = Uri.UnescapeDataString(uri.Path);
-            if (File.Exists(path))
-            {
-                return path;
-            }
-
-            // file not found..exception
-            throw new FileNotFoundException(String.Format("File not found: {0}", path), path);
-        }
-
-        /// <summary>
         /// Checks whether the file pointed at by <paramref name="pathToFile"/> can be opened
         /// for writing.
         /// </summary>
@@ -172,67 +99,17 @@
         }
 
         /// <summary>
-        /// 
+        /// Asserts that the execution of some implementation of a functionality runs faster than a given allowed time.
         /// </summary>
-        /// <param name="maxMilliseconds"></param>
-        /// <param name="action"></param>
+        /// <param name="maxMilliseconds">The maximum time in milliseconds that the functionality is allowed to run.</param>
+        /// <param name="action">The functionality to execute.</param>
         /// <param name="rankHddAccess">Take HDD speed into account, makes sure that test timing is divided by MACHINE_HDD_PERFORMANCE_RANK environmental variable.</param>
-        /// <returns></returns>
-        public static double AssertIsFasterThan(float maxMilliseconds, Action action, bool rankHddAccess = false)
+        public static void AssertIsFasterThan(float maxMilliseconds, Action action, bool rankHddAccess = false)
         {
-            return AssertIsFasterThan(maxMilliseconds, null, action, rankHddAccess);
+            AssertIsFasterThan(maxMilliseconds, null, action, rankHddAccess);
         }
 
         /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="maxMilliseconds"></param>
-        /// <param name="message"></param>
-        /// <param name="action"></param>
-        /// <param name="rankHddAccess">Take HDD speed into account, makes sure that test timing is divided by MACHINE_HDD_PERFORMANCE_RANK environmental variable.</param>
-        /// <returns></returns>
-        public static double AssertIsFasterThan(float maxMilliseconds, string message, Action action, bool rankHddAccess)
-        {
-            var stopwatch = new Stopwatch();
-            var actualMillisecond = default(double);
-
-            stopwatch.Start();
-            action();
-            stopwatch.Stop();
-
-            actualMillisecond = Math.Abs(actualMillisecond - default(double)) > 1e-5
-                                    ? Math.Min(stopwatch.ElapsedMilliseconds, actualMillisecond)
-                                    : stopwatch.ElapsedMilliseconds;
-
-            stopwatch.Reset();
-
-            var machineHddPerformanceRank = GetMachineHddPerformanceRank();
-            var rank = machineHddPerformanceRank;
-
-            if (rankHddAccess) // when test relies a lot on HDD - multiply rank by hdd speed factor
-            {
-                rank *= machineHddPerformanceRank;
-            }
-
-            var userMessage = string.IsNullOrEmpty(message) ? "" : message + ". ";
-            if (!rank.Equals(1.0f))
-            {
-                Assert.IsTrue(rank*actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}, machine performance weighted actual was {2}",
-                              maxMilliseconds, actualMillisecond, actualMillisecond*rank);
-                Console.WriteLine(userMessage + string.Format("Test took {1} milliseconds (machine performance weighted {2}). Maximum was {0}",
-                                                              maxMilliseconds, actualMillisecond, actualMillisecond*rank));
-            }
-            else
-            {
-                Assert.IsTrue(actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}", maxMilliseconds,
-                              actualMillisecond);
-                Console.WriteLine(userMessage + string.Format("Test took {1} milliseconds. Maximum was {0}", maxMilliseconds, actualMillisecond));
-            }
-
-            return actualMillisecond;
-        }
-
-        /// <summary>
         /// Checks if the given messages occurs in the log.
         /// </summary>
         /// <param name="action">Action to be performed while recording the log</param>
@@ -413,6 +290,45 @@
             }
         }
 
+        private static void AssertIsFasterThan(float maxMilliseconds, string message, Action action, bool rankHddAccess)
+        {
+            var stopwatch = new Stopwatch();
+            var actualMillisecond = default(double);
+
+            stopwatch.Start();
+            action();
+            stopwatch.Stop();
+
+            actualMillisecond = Math.Abs(actualMillisecond - default(double)) > 1e-5
+                                    ? Math.Min(stopwatch.ElapsedMilliseconds, actualMillisecond)
+                                    : stopwatch.ElapsedMilliseconds;
+
+            stopwatch.Reset();
+
+            var machineHddPerformanceRank = GetMachineHddPerformanceRank();
+            var rank = machineHddPerformanceRank;
+
+            if (rankHddAccess) // when test relies a lot on HDD - multiply rank by hdd speed factor
+            {
+                rank *= machineHddPerformanceRank;
+            }
+
+            var userMessage = string.IsNullOrEmpty(message) ? "" : message + ". ";
+            if (!rank.Equals(1.0f))
+            {
+                Assert.IsTrue(rank*actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}, machine performance weighted actual was {2}",
+                              maxMilliseconds, actualMillisecond, actualMillisecond*rank);
+                Console.WriteLine(userMessage + string.Format("Test took {1} milliseconds (machine performance weighted {2}). Maximum was {0}",
+                                                              maxMilliseconds, actualMillisecond, actualMillisecond*rank));
+            }
+            else
+            {
+                Assert.IsTrue(actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}", maxMilliseconds,
+                              actualMillisecond);
+                Console.WriteLine(userMessage + string.Format("Test took {1} milliseconds. Maximum was {0}", maxMilliseconds, actualMillisecond));
+            }
+        }
+
         private static void AssertExpectedMessagesInRenderedMessages(IEnumerable<string> messages, IEnumerable<Tuple<string, Level>> renderedMessages)
         {
             foreach (string message in messages)
@@ -447,48 +363,6 @@
             AssertImagesAreEqual(icon, item.Image);
         }
 
-        /// <summary>
-        /// Create dir if not exists.
-        /// </summary>
-        /// <param name="path">File path to a directory.</param>
-        /// <exception cref="IOException"> When:
-        ///   The directory specified by <paramref name="path"/> is read-only
-        /// </exception>
-        /// <exception cref="UnauthorizedAccessException"> When: The caller does not have the required permission.</exception>
-        /// <exception cref="ArgumentException">
-        ///   <paramref name="path"/> is a zero-length string, contains only white space, or contains one or more invalid characters as defined by <see cref="Path.GetInvalidPathChars"/>. -or- 
-        ///   <paramref name="path"/> is prefixed with, or contains only a colon character (:).</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="path"/> is null.</exception>
-        /// <exception cref="PathTooLongException">
-        ///   The specified path, file name, or both exceed the system-defined maximum length. 
-        ///   For example, on Windows-based platforms, paths must be less than 248 characters and file names must be less than 260 characters. </exception>
-        /// <exception cref="DirectoryNotFoundException">The specified path is invalid (for example, it is on an unmapped drive).</exception>
-        /// <exception cref="NotSupportedException"><paramref name="path"/> contains a colon character (:) that is not part of a drive label ("C:\").</exception>
-        private static void CreateDirectoryIfNotExists(string path)
-        {
-            if (!Directory.Exists(path))
-            {
-                Directory.CreateDirectory(path);
-            }
-        }
-
-        private static string GetCurrentTestClassMethodName()
-        {
-            var stackTrace = new StackTrace(false);
-
-            for (int i = 1; i < stackTrace.FrameCount; i++)
-            {
-                StackFrame stackFrame = stackTrace.GetFrame(i);
-                if (stackFrame.GetMethod().GetCustomAttributes(true).OfType<TestAttribute>().Count() != 0)
-                {
-                    MethodBase method = stackFrame.GetMethod();
-                    return method.DeclaringType.Name + "." + method.Name;
-                }
-            }
-
-            return "<unknown test method>";
-        }
-
         private static string GetSolutionRoot()
         {
             const string solutionName = "Ringtoets.sln";
@@ -519,17 +393,6 @@
             return 1.0f;
         }
 
-        private static float GetMachinePerformanceRank()
-        {
-            string rank = Environment.GetEnvironmentVariable("MACHINE_PERFORMANCE_RANK");
-            if (!String.IsNullOrEmpty(rank))
-            {
-                return Single.Parse(rank);
-            }
-
-            return 1.0f;
-        }
-
         private static IEnumerable<Tuple<string, Level>> GetAllRenderedMessages(Action action)
         {
             var memoryAppender = new MemoryAppender();
Index: Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs
===================================================================
diff -u -r31d4921763c045040f9300542aed356147966cc8 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs	(.../ChartPlugin.cs)	(revision 31d4921763c045040f9300542aed356147966cc8)
+++ Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs	(.../ChartPlugin.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -51,7 +51,7 @@
         public override void Activate()
         {
             chartLegendController = CreateLegendController(Gui);
-            chartingRibbon = CreateRibbon(chartLegendController, Gui);
+            chartingRibbon = CreateRibbon(chartLegendController);
 
             chartLegendController.ToggleView();
             Gui.ViewHost.ActiveDocumentViewChanged += OnActiveDocumentViewChanged;
@@ -86,9 +86,8 @@
         /// </summary>
         /// <param name="chartLegendController">The <see cref="ChartLegendController"/> to use for the 
         /// <see cref="ChartingRibbon"/>.</param>
-        /// <param name="viewController">The controller for views.</param>
         /// <returns>A new <see cref="ChartingRibbon"/> instance.</returns>
-        private static ChartingRibbon CreateRibbon(ChartLegendController chartLegendController, IViewController viewController)
+        private static ChartingRibbon CreateRibbon(ChartLegendController chartLegendController)
         {
             return new ChartingRibbon
             {
Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -176,7 +176,7 @@
                 MapResources.MapLegendView_MapDataCollectionContextMenuStrip__Add_MapLayer,
                 MapResources.MapLegendView_MapDataCollectionContextMenuStrip_Add_MapLayer_ToolTip,
                 MapResources.MapPlusIcon,
-                (sender, args) => ShowSelectShapeFileDialog(sender, args, mapDataCollection));
+                (sender, args) => ShowSelectShapeFileDialog(mapDataCollection));
 
             return contextMenuBuilderProvider.Get(mapDataCollection, treeView).AddCustomItem(addMapLayerMenuItem).Build();
         }
@@ -185,7 +185,7 @@
 
         #region ShapeFileImporter
 
-        private void ShowSelectShapeFileDialog(object sender, EventArgs eventArgs, MapDataCollection mapDataCollection)
+        private void ShowSelectShapeFileDialog(MapDataCollection mapDataCollection)
         {
             var windowTitle = MapResources.MapLegendView_ShowSelectShapeFileDialog_Select_Shape_File;
             using (var dialog = new OpenFileDialog
Index: Core/Plugins/src/Core.Plugins.Map/MapRibbon.xaml.cs
===================================================================
diff -u -r6195c365f8d9685719b4a9bd73685d04ca917d6e -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Core/Plugins/src/Core.Plugins.Map/MapRibbon.xaml.cs	(.../MapRibbon.xaml.cs)	(revision 6195c365f8d9685719b4a9bd73685d04ca917d6e)
+++ Core/Plugins/src/Core.Plugins.Map/MapRibbon.xaml.cs	(.../MapRibbon.xaml.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
 using System.Windows;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
Index: Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs
===================================================================
diff -u -r6195c365f8d9685719b4a9bd73685d04ca917d6e -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 6195c365f8d9685719b4a9bd73685d04ca917d6e)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Windows;
+using System.Windows;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoestDemoProjectRibbonTest.cs
===================================================================
diff -u -r6195c365f8d9685719b4a9bd73685d04ca917d6e -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoestDemoProjectRibbonTest.cs	(.../RingtoestDemoProjectRibbonTest.cs)	(revision 6195c365f8d9685719b4a9bd73685d04ca917d6e)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoestDemoProjectRibbonTest.cs	(.../RingtoestDemoProjectRibbonTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -1,8 +1,6 @@
-using System.Linq;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using Core.Common.Controls.Commands;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewHost;
 using Demo.Ringtoets.Ribbons;
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs
===================================================================
diff -u -r1e5d9b5cfc66cb8187d534d891afef1c9080378b -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs	(.../IAssessmentSection.cs)	(revision 1e5d9b5cfc66cb8187d534d891afef1c9080378b)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs	(.../IAssessmentSection.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -36,7 +36,7 @@
         /// <summary>
         /// Gets or sets the identifier of the assessment section.
         /// </summary>
-        string Id { get; set; }
+        string Id { get; }
 
         /// <summary>
         /// Gets or sets the name of the assessment section.
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -206,7 +206,7 @@
             }
             NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Removing_hydraulic_boundary_output,
                            4, 4);
-            ClearHydraulicBoundaryOutput(assessmentSection);
+            ClearHydraulicBoundaryOutput();
         }
 
         private void ClearCalculationOutput(IFailureMechanism failureMechanism)
@@ -225,7 +225,7 @@
             changedObservables.Add(failureMechanism);
         }
 
-        private void ClearHydraulicBoundaryOutput(IAssessmentSection assessmentSection)
+        private void ClearHydraulicBoundaryOutput()
         {
             // TODO: WTI-440 - Clear all 'Toetspeil' calculation output
             //changedObservables.Add(clearedInstance);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -rd65d6b037600ccd69f386d9164172dd2c133356e -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision d65d6b037600ccd69f386d9164172dd2c133356e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -93,9 +93,6 @@
             }
         }
 
-        private const int nameColumnIndex = 0;
-        private const int assessmentLayerOneIndex = 1;
-
         private TestFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView()
         {
             var failureMechanism = new TestFailureMechanism();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileExporters/HydraulicBoundaryLocationsExporterTest.cs
===================================================================
diff -u -ref9736bc348f44143fccc4c399825cf7f947599d -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileExporters/HydraulicBoundaryLocationsExporterTest.cs	(.../HydraulicBoundaryLocationsExporterTest.cs)	(revision ef9736bc348f44143fccc4c399825cf7f947599d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileExporters/HydraulicBoundaryLocationsExporterTest.cs	(.../HydraulicBoundaryLocationsExporterTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -61,8 +61,6 @@
                 WaveHeight = 222.222
             };
 
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO, "test.shp");
-
             // Call
             TestDelegate call = () => new HydraulicBoundaryLocationsExporter(new[] { hydraulicBoundaryLocation }, null);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -134,6 +134,7 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Expect(o => o.Id).Return(null);
             assessmentSectionStub.Expect(o => o.NotifyObservers());
 
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 30000);
@@ -234,6 +235,7 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Expect(o => o.Id).Return(null);
             assessmentSectionStub.Expect(o => o.NotifyObservers());
 
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 30000);
@@ -262,6 +264,7 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Expect(o => o.Id).Return(null);
             assessmentSectionStub.Expect(o => o.NotifyObservers());
 
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 30000);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r4b647301c81c13810237268da2364d1568ad186d -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 4b647301c81c13810237268da2364d1568ad186d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -133,6 +133,7 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Expect(o => o.Id).Return(null);
             assessmentSectionStub.Expect(o => o.NotifyObservers());
 
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 30000);
@@ -169,6 +170,7 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Expect(o => o.Id).Return(null);
             assessmentSectionStub.Expect(o => o.NotifyObservers());
 
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 30000);
@@ -242,6 +244,7 @@
             observerMock.Expect(o => o.UpdateObserver());
 
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Expect(o => o.Id).Return(null);
             assessmentSectionStub.Expect(o => o.NotifyObservers());
 
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 30000);
@@ -274,6 +277,7 @@
             observerMock.Expect(o => o.UpdateObserver());
 
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Expect(o => o.Id).Return(null);
             assessmentSectionStub.Expect(o => o.NotifyObservers());
 
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 30000);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingInput.cs
===================================================================
diff -u -r91458a263d42489cb2033e0bf56372e38a427b27 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingInput.cs	(.../DerivedPipingInput.cs)	(revision 91458a263d42489cb2033e0bf56372e38a427b27)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingInput.cs	(.../DerivedPipingInput.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -315,8 +315,7 @@
 
             return distributions.All(currentLayerDistribution => AreShiftAndDeviationEqual(
                 currentLayerDistribution, 
-                distributions[0], 
-                numberOfDecimals));
+                distributions[0]));
         }
 
         private static LogNormalDistribution[] GetLayerDistributionDefinitions(IList<PipingSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
@@ -336,7 +335,7 @@
             }
         }
 
-        private static bool AreShiftAndDeviationEqual(LogNormalDistribution currentLayerDistribution, LogNormalDistribution baseLayerDistribution, int numberOfDecimals)
+        private static bool AreShiftAndDeviationEqual(LogNormalDistribution currentLayerDistribution, LogNormalDistribution baseLayerDistribution)
         {
             return currentLayerDistribution.StandardDeviation == baseLayerDistribution.StandardDeviation &&
                    currentLayerDistribution.Shift == baseLayerDistribution.Shift;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs	(.../DesignVariableTypeConverter.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs	(.../DesignVariableTypeConverter.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -170,17 +170,6 @@
             }
 
             /// <summary>
-            /// Instantiates a new instance of <see cref="ParameterDefinition{T}"/> for a
-            /// given parameter.
-            /// </summary>
-            /// <param name="expression">The parameter expression.</param>
-            public ParameterDefinition(Expression<Func<DistributionType, double>> expression)
-            {
-                PropertyName = ((MemberExpression) expression.Body).Member.Name;
-                GetValue = expression.Compile();
-            }
-
-            /// <summary>
             /// The symbol of name of the parameter.
             /// </summary>
             public string Symbol { get; set; }
Fisheye: Tag be66e1bec38a780abb27fedea8632acf4d24a173 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Helper/PipingOutputCreator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -ra4eed06be1ec058f2dea53b95ec62e3380ed75c5 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision a4eed06be1ec058f2dea53b95ec62e3380ed75c5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -78,7 +78,6 @@
     <Compile Include="PropertyClasses\PipingInputContextPropertiesTest.cs" />
     <Compile Include="TreeNodeInfos\StochasticSoilModelContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\PipingCalculationScenarioContextTreeNodeInfoTest.cs" />
-    <Compile Include="Helper\PipingOutputCreator.cs" />
     <Compile Include="TreeNodeInfos\PipingFailureMechanismContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\PipingSemiProbabilisticOutputTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\StochasticSoilModelTreeNodeInfoTest.cs" />
@@ -212,6 +211,9 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Helper\" />
+  </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/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs	(.../StochasticSoilModelReaderTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs	(.../StochasticSoilModelReaderTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -144,7 +144,7 @@
             Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits.");
 
             // Call
-            TestDelegate test = () => { using (var s = new StochasticSoilModelReader(dbFile)) {} };
+            TestDelegate test = () => { using (new StochasticSoilModelReader(dbFile)) {} };
 
             // Assert
             var exception = Assert.Throws<CriticalFileReadException>(test);
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs	(.../StochasticSoilProfileReaderTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs	(.../StochasticSoilProfileReaderTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -124,7 +124,7 @@
             Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits.");
 
             // Call
-            TestDelegate test = () => { using (var s = new StochasticSoilProfileReader(dbFile)) {} };
+            TestDelegate test = () => { using (new StochasticSoilProfileReader(dbFile)) {} };
 
             // Assert
             var exception = Assert.Throws<CriticalFileReadException>(test);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs
===================================================================
diff -u -r4430e1e5a3bd4f8e6be06c7a48670deb22f60960 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs	(.../PipingCalculationsViewIntegrationTest.cs)	(revision 4430e1e5a3bd4f8e6be06c7a48670deb22f60960)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs	(.../PipingCalculationsViewIntegrationTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -134,9 +134,6 @@
         private const int stochasticSoilModelsColumnIndex = 1;
         private const int stochasticSoilProfilesColumnIndex = 2;
         private const int hydraulicBoundaryLocationsColumnIndex = 4;
-        private const int dampingFactorExitMeanColumnIndex = 5;
-        private const int phreaticLevelExitMeanColumnIndex = 6;
-        private const int entryPointLColumnIndex = 7;
         private const int exitPointLColumnIndex = 8;
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs
===================================================================
diff -u -r1051f838aebbd5977351542027ce6330583b0d43 -rbe66e1bec38a780abb27fedea8632acf4d24a173
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs	(.../PipingFailureMechanismResultViewIntegrationTest.cs)	(revision 1051f838aebbd5977351542027ce6330583b0d43)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs	(.../PipingFailureMechanismResultViewIntegrationTest.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
@@ -156,10 +156,6 @@
             }
         }
 
-        private const int nameColumnIndex = 0;
-        private const int assessmentLayerOneIndex = 1;
         private const int assessmentLayerTwoAIndex = 2;
-        private const int assessmentLayerTwoBIndex = 3;
-        private const int assessmentLayerThreeIndex = 4;
     }
 }
\ No newline at end of file