Index: Core/Plugins/src/Core.Plugins.Chart/ChartingRibbon.xaml.cs
===================================================================
diff -u -r6195c365f8d9685719b4a9bd73685d04ca917d6e -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/src/Core.Plugins.Chart/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 6195c365f8d9685719b4a9bd73685d04ca917d6e)
+++ Core/Plugins/src/Core.Plugins.Chart/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -71,6 +71,18 @@
         /// </summary>
         public ICommand ToggleLegendViewCommand { private get; set; }
 
+        public Ribbon GetRibbonControl()
+        {
+            return RibbonControl;
+        }
+
+        public void ValidateItems()
+        {
+            ToggleLegendViewButton.IsChecked = ToggleLegendViewCommand != null && ToggleLegendViewCommand.Checked;
+            TogglePanningButton.IsChecked = Chart != null && Chart.IsPanningEnabled;
+            ToggleRectangleZoomingButton.IsChecked = Chart != null && Chart.IsRectangleZoomingEnabled;
+        }
+
         /// <summary>
         /// Shows the charting contextual tab.
         /// </summary>
@@ -88,18 +100,6 @@
             ChartingContextualGroup.Visibility = Visibility.Collapsed;
         }
 
-        public Ribbon GetRibbonControl()
-        {
-            return RibbonControl;
-        }
-
-        public void ValidateItems()
-        {
-            ToggleLegendViewButton.IsChecked = ToggleLegendViewCommand != null && ToggleLegendViewCommand.Checked;
-            TogglePanningButton.IsChecked = Chart != null && Chart.IsPanningEnabled;
-            ToggleRectangleZoomingButton.IsChecked = Chart != null && Chart.IsRectangleZoomingEnabled;
-        }
-
         private void ButtonToggleLegend_Click(object sender, RoutedEventArgs e)
         {
             ToggleLegendViewCommand.Execute();
Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendController.cs
===================================================================
diff -u -r84e9dd40942da514fb2f2cb270001e81857b1be4 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendController.cs	(.../MapLegendController.cs)	(revision 84e9dd40942da514fb2f2cb270001e81857b1be4)
+++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendController.cs	(.../MapLegendController.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -112,6 +112,11 @@
             }
         }
 
+        public void Dispose()
+        {
+            CloseLegendView();
+        }
+
         /// <summary>
         /// Opens the <see cref="MapLegendView"/>.
         /// </summary>
@@ -136,10 +141,5 @@
             viewController.ViewHost.Remove(legendView);
             legendView = null;
         }
-
-        public void Dispose()
-        {
-            CloseLegendView();
-        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Map/MapRibbon.xaml
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/src/Core.Plugins.Map/MapRibbon.xaml	(.../MapRibbon.xaml)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Core/Plugins/src/Core.Plugins.Map/MapRibbon.xaml	(.../MapRibbon.xaml)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -53,7 +53,7 @@
                 <fluent:Button x:Name="ZoomToAllButton" Header="{x:Static p:Resources.Ribbon_ZoomToAll}" ToolTip="{x:Static p:Resources.Ribbon_ZoomToAll_ToolTip}" Icon="{Binding Source={x:Static p:Resources.ZoomToAllIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Middle" Click="ButtonZoomToAll_Click" fluent:KeyTip.Keys="A"/>
             </fluent:RibbonGroupBox>
             <fluent:RibbonGroupBox Header="{x:Static p:Resources.Ribbon_GroupBox_Tools}">
-                <fluent:ToggleButton Name="ToggleMouseCoordinatesButton" Header="{x:Static p:Resources.Ribbon_Toggle_Coordinates}" ToolTip="{x:Static p:Resources.Ribbon_Toggle_Coordinates_ToolTip}" SizeDefinition="Middle" Icon="{Binding Source={x:Static p:Resources.MapPointIcon}, Converter={StaticResource IconConverter}}" Click="ButtonToggleMouseCoordinates_Click" fluent:KeyTip.Keys="C"></fluent:ToggleButton>
+                <fluent:ToggleButton Name="ToggleMouseCoordinatesButton" Header="{x:Static p:Resources.Ribbon_Toggle_Coordinates}" ToolTip="{x:Static p:Resources.Ribbon_Toggle_Coordinates_ToolTip}" SizeDefinition="Middle" Icon="{Binding Source={x:Static p:Resources.MapPointIcon}, Converter={StaticResource IconConverter}}" Click="ButtonToggleMouseCoordinates_Click" fluent:KeyTip.Keys="C" />
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
     </fluent:Ribbon>
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs
===================================================================
diff -u -rba9236580e1e4361d4c5392c238f8b9930aaa90e -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision ba9236580e1e4361d4c5392c238f8b9930aaa90e)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -79,6 +79,14 @@
             BindTreeInteractionEvents();
         }
 
+        public TreeViewControl TreeViewControl
+        {
+            get
+            {
+                return treeViewControl;
+            }
+        }
+
         public object Data
         {
             get
@@ -94,14 +102,6 @@
             }
         }
 
-        public TreeViewControl TreeViewControl
-        {
-            get
-            {
-                return treeViewControl;
-            }
-        }
-
         public object Selection
         {
             get
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerViewController.cs
===================================================================
diff -u -re052252f6f2523cfb33413867a939834ef763ce5 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerViewController.cs	(.../ProjectExplorerViewController.cs)	(revision e052252f6f2523cfb33413867a939834ef763ce5)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerViewController.cs	(.../ProjectExplorerViewController.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -37,16 +37,16 @@
     /// </summary>
     public class ProjectExplorerViewController : IDisposable
     {
-        private readonly IViewController viewController;
-        private readonly IEnumerable<TreeNodeInfo> treeNodeInfos;
-        private readonly IApplicationSelection applicationSelection;
-        private readonly IViewCommands viewCommands;
-
         /// <summary>
         /// Fired when the project explorer view has been opened.
         /// </summary>
         public event EventHandler<EventArgs> OnOpenView;
 
+        private readonly IViewController viewController;
+        private readonly IEnumerable<TreeNodeInfo> treeNodeInfos;
+        private readonly IApplicationSelection applicationSelection;
+        private readonly IViewCommands viewCommands;
+
         private ProjectExplorer projectExplorer;
 
         /// <summary>
Index: Core/Plugins/test/Core.Plugins.Chart.Test/ChartingRibbonTest.cs
===================================================================
diff -u -r6195c365f8d9685719b4a9bd73685d04ca917d6e -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Chart.Test/ChartingRibbonTest.cs	(.../ChartingRibbonTest.cs)	(revision 6195c365f8d9685719b4a9bd73685d04ca917d6e)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/ChartingRibbonTest.cs	(.../ChartingRibbonTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -20,13 +20,14 @@
 // All rights reserved.
 
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using Core.Common.Controls.Commands;
 using Core.Components.Charting.Forms;
 using Fluent;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Button = Fluent.Button;
-using ButtonBase = System.Windows.Controls.Primitives.ButtonBase;
-using ICommand = Core.Common.Controls.Commands.ICommand;
 using ToggleButton = Fluent.ToggleButton;
 
 namespace Core.Plugins.Chart.Test
@@ -42,9 +43,9 @@
             var ribbon = new ChartingRibbon();
 
             // Call & Assert
-            Assert.IsInstanceOf<System.Windows.Controls.Control>(ribbon.GetRibbonControl());
+            Assert.IsInstanceOf<Control>(ribbon.GetRibbonControl());
         }
-        
+
         [Test]
         [RequiresSTA]
         public void TogglePanning_OnClick_TogglePanning()
@@ -233,7 +234,7 @@
             };
 
             var toggleLegendViewButton = ribbon.GetRibbonControl().FindName("ToggleLegendViewButton") as ToggleButton;
-            
+
             // Precondition
             Assert.IsNotNull(toggleLegendViewButton, "Ribbon should have a toggle legend view button.");
 
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Commands/ToggleLegendViewCommandTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Chart.Test/Commands/ToggleLegendViewCommandTest.cs	(.../ToggleLegendViewCommandTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Commands/ToggleLegendViewCommandTest.cs	(.../ToggleLegendViewCommandTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -60,10 +60,7 @@
 
                 viewController.Stub(tvc => tvc.ViewHost).Return(viewHost);
                 viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-                viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-                {
-                    toolViewList.Add(invocation.Arguments[0] as ChartLegendView);
-                });
+                viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); });
 
                 viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
             }
@@ -99,10 +96,7 @@
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
 
             // Open
-            viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-            {
-                toolViewList.Add(invocation.Arguments[0] as ChartLegendView);
-            });
+            viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); });
             viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
 
             // Close
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -44,6 +44,61 @@
         private ChartLegendView chartLegendView;
         private TreeNodeInfo info;
 
+        private static IEnumerable<TestCaseData> ChartDataLegendImages
+        {
+            get
+            {
+                yield return new TestCaseData(new ChartPointData("test"), Resources.PointsIcon);
+                yield return new TestCaseData(new ChartLineData("test"), Resources.LineIcon);
+                yield return new TestCaseData(new ChartAreaData("test"), Resources.AreaIcon);
+                yield return new TestCaseData(new ChartMultipleAreaData("test data"), Resources.AreaIcon);
+                yield return new TestCaseData(new ChartDataCollection("test"), GuiResources.folder);
+            }
+        }
+
+        private static IEnumerable<ChartData> DragChartData
+        {
+            get
+            {
+                return new ChartData[]
+                {
+                    new ChartPointData("test"),
+                    new ChartLineData("test"),
+                    new ChartAreaData("Test"),
+                    new ChartDataCollection("test")
+                };
+            }
+        }
+
+        private static IEnumerable<ChartData> NoChartDataCollection
+        {
+            get
+            {
+                return new ChartData[]
+                {
+                    new ChartPointData("test"),
+                    new ChartLineData("test"),
+                    new ChartAreaData("Test"),
+                    new ChartMultipleAreaData("test data")
+                };
+            }
+        }
+
+        private static IEnumerable<TestCaseData> IsCheckedChartData
+        {
+            get
+            {
+                yield return new TestCaseData(new ChartPointData("test"), false);
+                yield return new TestCaseData(new ChartPointData("test"), true);
+                yield return new TestCaseData(new ChartLineData("test"), false);
+                yield return new TestCaseData(new ChartLineData("test"), true);
+                yield return new TestCaseData(new ChartAreaData("test"), false);
+                yield return new TestCaseData(new ChartAreaData("test"), true);
+                yield return new TestCaseData(new ChartMultipleAreaData("test data"), false);
+                yield return new TestCaseData(new ChartMultipleAreaData("test data"), true);
+            }
+        }
+
         [SetUp]
         public void SetUp()
         {
@@ -121,7 +176,7 @@
             var objects = info.ChildNodeObjects(context);
 
             // Assert
-            var expectedChildren= new[]
+            var expectedChildren = new[]
             {
                 new ChartDataContext(chartData3, new ChartDataCollection("test")),
                 new ChartDataContext(chartData2, new ChartDataCollection("test")),
@@ -374,7 +429,7 @@
 
                 // Assert
                 var reversedIndex = 2 - position;
-                ChartDataCollection wrappedCollectionData = (ChartDataCollection)collectionContext.WrappedData;
+                ChartDataCollection wrappedCollectionData = (ChartDataCollection) collectionContext.WrappedData;
                 Assert.AreSame(context1.WrappedData, wrappedCollectionData.Collection.ElementAt(reversedIndex));
 
                 mocks.VerifyAll();
@@ -428,60 +483,5 @@
         {
             return new ChartDataContext(chartData, chartDataCollection ?? new ChartDataCollection("test"));
         }
-
-        private static IEnumerable<TestCaseData> ChartDataLegendImages
-        {
-            get
-            {
-                yield return new TestCaseData(new ChartPointData("test"), Resources.PointsIcon);
-                yield return new TestCaseData(new ChartLineData("test"), Resources.LineIcon);
-                yield return new TestCaseData(new ChartAreaData("test"), Resources.AreaIcon);
-                yield return new TestCaseData(new ChartMultipleAreaData("test data"), Resources.AreaIcon);
-                yield return new TestCaseData(new ChartDataCollection("test"), GuiResources.folder);
-            }
-        }
-
-        private static IEnumerable<ChartData> DragChartData
-        {
-            get
-            {
-                return new ChartData[]
-                {
-                    new ChartPointData("test"), 
-                    new ChartLineData("test"), 
-                    new ChartAreaData("Test"),
-                    new ChartDataCollection("test")
-                };
-            }
-        }
-
-        private static IEnumerable<ChartData> NoChartDataCollection
-        {
-            get
-            {
-                return new ChartData[]
-                {
-                    new ChartPointData("test"),
-                    new ChartLineData("test"),
-                    new ChartAreaData("Test"),
-                    new ChartMultipleAreaData("test data")
-                };
-            }
-        }
-        
-        private static IEnumerable<TestCaseData> IsCheckedChartData
-        {
-            get
-            {
-                yield return new TestCaseData(new ChartPointData("test"), false);
-                yield return new TestCaseData(new ChartPointData("test"), true);
-                yield return new TestCaseData(new ChartLineData("test"), false);
-                yield return new TestCaseData(new ChartLineData("test"), true);
-                yield return new TestCaseData(new ChartAreaData("test"), false);
-                yield return new TestCaseData(new ChartAreaData("test"), true);
-                yield return new TestCaseData(new ChartMultipleAreaData("test data"), false);
-                yield return new TestCaseData(new ChartMultipleAreaData("test data"), true);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendControllerTest.cs
===================================================================
diff -u -r31d4921763c045040f9300542aed356147966cc8 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendControllerTest.cs	(.../ChartLegendControllerTest.cs)	(revision 31d4921763c045040f9300542aed356147966cc8)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendControllerTest.cs	(.../ChartLegendControllerTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -76,10 +76,7 @@
 
                 viewController.Stub(tvc => tvc.ViewHost).Return(viewHost);
                 viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-                viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-                {
-                    toolViewList.Add(invocation.Arguments[0] as ChartLegendView);
-                });
+                viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); });
                 viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
             }
 
@@ -116,10 +113,7 @@
             var toolViewList = new List<IView>();
             viewController.Stub(tvc => tvc.ViewHost).Return(viewHost);
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-            viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-            {
-                toolViewList.Add(invocation.Arguments[0] as ChartLegendView);
-            });
+            viewHost.Expect(vm => vm.AddToolView(Arg<ChartLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); });
 
             if (open)
             {
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r2c6171c45fe80090abcff004a03b8023196a7fe7 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Chart.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 2c6171c45fe80090abcff004a03b8023196a7fe7)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -24,4 +24,4 @@
 
 [assembly: AssemblyTitle("Core.Plugins.Chart.Test")]
 [assembly: AssemblyProduct("Core.Plugins.Chart.Test")]
-[assembly: Guid("5b5d3afc-316c-44e9-90ba-4b55cfa074f8")]
+[assembly: Guid("5b5d3afc-316c-44e9-90ba-4b55cfa074f8")]
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs	(.../ToggleMapLegendViewCommandTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs	(.../ToggleMapLegendViewCommandTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -65,10 +65,9 @@
 
                 viewController.Stub(vc => vc.ViewHost).Return(viewHost);
                 viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-                viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-                {
-                    toolViewList.Add(invocation.Arguments[0] as MapLegendView);
-                });
+                viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true),
+                                                     Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left)))
+                        .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); });
 
                 viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
             }
@@ -106,10 +105,9 @@
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
 
             // Open
-            viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-            {
-                toolViewList.Add(invocation.Arguments[0] as MapLegendView);
-            });
+            viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true),
+                                                 Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left)))
+                    .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); });
             viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
 
             // Close
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs
===================================================================
diff -u -rc5717eada81586126cbf53266abb0fc925382393 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs	(.../MapLegendControllerTest.cs)	(revision c5717eada81586126cbf53266abb0fc925382393)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs	(.../MapLegendControllerTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -126,10 +126,7 @@
 
                 viewController.Stub(tvc => tvc.ViewHost).Return(viewHost);
                 viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-                viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-                {
-                    toolViewList.Add(invocation.Arguments[0] as MapLegendView);
-                });
+                viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); });
                 viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
             }
 
@@ -165,10 +162,7 @@
             var toolViewList = new List<IView>();
             viewController.Stub(vc => vc.ViewHost).Return(viewHost);
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-            viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-            {
-                toolViewList.Add(invocation.Arguments[0] as MapLegendView);
-            });
+            viewHost.Expect(vm => vm.AddToolView(Arg<MapLegendView>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); });
             viewHost.Stub(tvc => tvc.SetImage(null, null)).IgnoreArguments();
 
             if (open)
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -127,6 +127,20 @@
             Assert.IsTrue(canCheck);
         }
 
+        [Test]
+        public void CanDrag_Always_ReturnsTrue()
+        {
+            // Setup
+            mocks.ReplayAll();
+            var mapLineData = new MapLineData("test data");
+
+            // Call
+            var canDrag = info.CanDrag(mapLineData, null);
+
+            // Assert
+            Assert.IsTrue(canDrag);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void IsChecked_Always_ReturnsAccordingToVisibleStateOfLineData(bool isVisible)
@@ -184,19 +198,5 @@
             // Assert
             Assert.AreEqual(!initialVisibleState, mapLineData.IsVisible);
         }
-
-        [Test]
-        public void CanDrag_Always_ReturnsTrue()
-        {
-            // Setup
-            mocks.ReplayAll();
-            var mapLineData = new MapLineData("test data");
-
-            // Call
-            var canDrag = info.CanDrag(mapLineData, null);
-
-            // Assert
-            Assert.IsTrue(canDrag);
-        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Map.Test/MapRibbonTest.cs
===================================================================
diff -u -r6195c365f8d9685719b4a9bd73685d04ca917d6e -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Map.Test/MapRibbonTest.cs	(.../MapRibbonTest.cs)	(revision 6195c365f8d9685719b4a9bd73685d04ca917d6e)
+++ Core/Plugins/test/Core.Plugins.Map.Test/MapRibbonTest.cs	(.../MapRibbonTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -20,14 +20,14 @@
 // All rights reserved.
 
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using Core.Common.Controls.Commands;
 using Core.Components.Gis.Forms;
 using Fluent;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Button = Fluent.Button;
-using ButtonBase = System.Windows.Controls.Primitives.ButtonBase;
-using Control = System.Windows.Controls.Control;
 using ToggleButton = Fluent.ToggleButton;
 
 namespace Core.Plugins.Map.Test
@@ -192,7 +192,7 @@
             Assert.AreEqual(mouseCoordinatesChecked, button.IsChecked);
             mocks.VerifyAll();
         }
-				
+
         [Test]
         [RequiresSTA]
         public void ToggleLegendViewButton_OnClick_ExecutesToggleLegendViewCommand()
@@ -273,7 +273,7 @@
             // Assert
             mocks.VerifyAll();
         }
-        
+
         [Test]
         [RequiresSTA]
         public void ZoomToAll_OnClick_ZoomToAll()
Index: Core/Plugins/test/Core.Plugins.Map.Test/TestMapView.cs
===================================================================
diff -u -r946ef0d15ffd1d6618a39e96240ce3572aba10b7 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Map.Test/TestMapView.cs	(.../TestMapView.cs)	(revision 946ef0d15ffd1d6618a39e96240ce3572aba10b7)
+++ Core/Plugins/test/Core.Plugins.Map.Test/TestMapView.cs	(.../TestMapView.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Windows.Forms;
-
 using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Forms;
 
Index: Core/Plugins/test/Core.Plugins.Map.Test/TestView.cs
===================================================================
diff -u -r946ef0d15ffd1d6618a39e96240ce3572aba10b7 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.Map.Test/TestView.cs	(.../TestView.cs)	(revision 946ef0d15ffd1d6618a39e96240ce3572aba10b7)
+++ Core/Plugins/test/Core.Plugins.Map.Test/TestView.cs	(.../TestView.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Windows.Forms;
-
 using Core.Common.Controls.Views;
 
 namespace Core.Plugins.Map.Test
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs	(.../ToggleProjectExplorerCommandTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs	(.../ToggleProjectExplorerCommandTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -94,17 +94,15 @@
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
             if (isViewOpen)
             {
-                viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-                {
-                    toolViewList.Add(invocation.Arguments[0] as ProjectExplorer);
-                });
+                viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true),
+                                                     Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left)))
+                        .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
                 viewHost.Expect(tvc => tvc.SetImage(null, null)).IgnoreArguments();
             }
 
             var viewController = mocks.StrictMock<IViewController>();
             viewController.Stub(tvc => tvc.ViewHost).Return(viewHost);
 
-
             mocks.ReplayAll();
 
             var treeNodeInfos = Enumerable.Empty<TreeNodeInfo>();
@@ -140,10 +138,9 @@
             var toolViewList = new List<IView>();
             var viewHost = mocks.StrictMock<IViewHost>();
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-            viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-            {
-                toolViewList.Add(invocation.Arguments[0] as ProjectExplorer);
-            });
+            viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true),
+                                                 Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left)))
+                    .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
             viewHost.Stub(vm => vm.SetImage(null, null)).IgnoreArguments();
             if (isViewOpen)
             {
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj
===================================================================
diff -u -r3d84064b23186da3fb11f19ff0d07f41e1209bbb -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(.../Core.Plugins.ProjectExplorer.Test.csproj)	(revision 3d84064b23186da3fb11f19ff0d07f41e1209bbb)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(.../Core.Plugins.ProjectExplorer.Test.csproj)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -65,10 +65,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -88,9 +84,6 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs
===================================================================
diff -u -rba9236580e1e4361d4c5392c238f8b9930aaa90e -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs	(.../ProjectExplorerTest.cs)	(revision ba9236580e1e4361d4c5392c238f8b9930aaa90e)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs	(.../ProjectExplorerTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -238,7 +238,6 @@
                 viewCommands.Expect(a => a.OpenViewForSelection());
             }
 
-
             using (var explorer = new ProjectExplorer(applicationSelection, viewCommands, treeNodeInfos)
             {
                 Data = projectStub
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs
===================================================================
diff -u -ra32bbe3919b6babd74ae4867e8337662aed0dad2 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs	(.../ProjectExplorerViewControllerTest.cs)	(revision a32bbe3919b6babd74ae4867e8337662aed0dad2)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs	(.../ProjectExplorerViewControllerTest.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -72,10 +72,9 @@
             IViewHost viewHost = mocks.Stub<IViewHost>();
             var toolViewList = new List<IView>();
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-            viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-            {
-                toolViewList.Add(invocation.Arguments[0] as ProjectExplorer);
-            });
+            viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true),
+                                                 Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left)))
+                    .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
             viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
             viewHost.Expect(vm => vm.Remove(Arg<ProjectExplorer>.Is.TypeOf));
 
@@ -144,10 +143,9 @@
 
             if (isOpen)
             {
-                viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-                {
-                    toolViewList.Add(invocation.Arguments[0] as ProjectExplorer);
-                });
+                viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true),
+                                                     Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left)))
+                        .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
                 viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
             }
 
@@ -182,10 +180,9 @@
 
             var toolViewList = new List<IView>();
             viewHost.Stub(vm => vm.ToolViews).Return(toolViewList);
-            viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true), Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation =>
-            {
-                toolViewList.Add(invocation.Arguments[0] as ProjectExplorer);
-            });
+            viewHost.Expect(vm => vm.AddToolView(Arg<ProjectExplorer>.Matches(c => true),
+                                                 Arg<ToolViewLocation>.Matches(vl => vl == ToolViewLocation.Left)))
+                    .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
             viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
 
             IViewController viewController = mocks.Stub<IViewController>();
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r6f1e2e16c67292603f19489965183fa7176ff6af -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision 6f1e2e16c67292603f19489965183fa7176ff6af)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -140,7 +140,7 @@
         private static FailureMechanismSection DeepCloneSection(FailureMechanismSection section)
         {
             return new FailureMechanismSection(section.Name,
-                section.Points.Select(p=> new Point2D(p.X, p.Y)));
+                                               section.Points.Select(p => new Point2D(p.X, p.Y)));
         }
 
         private void InitializeDemoPipingData(AssessmentSection demoAssessmentSection)
Index: Demo/Ringtoets/src/Demo.Ringtoets/GUIs/DemoProjectPlugin.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Demo/Ringtoets/src/Demo.Ringtoets/GUIs/DemoProjectPlugin.cs	(.../DemoProjectPlugin.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Demo/Ringtoets/src/Demo.Ringtoets/GUIs/DemoProjectPlugin.cs	(.../DemoProjectPlugin.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -26,7 +26,6 @@
 using Core.Components.Gis.Data;
 using Demo.Ringtoets.Ribbons;
 using Demo.Ringtoets.Views;
-
 using ChartResources = Core.Plugins.Chart.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
Index: Demo/Ringtoets/src/Demo.Ringtoets/Views/ChartDataView.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Demo/Ringtoets/src/Demo.Ringtoets/Views/ChartDataView.cs	(.../ChartDataView.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Views/ChartDataView.cs	(.../ChartDataView.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -48,7 +48,7 @@
             }
             set
             {
-                data = (ChartDataCollection)value;
+                data = (ChartDataCollection) value;
 
                 if (data != null)
                 {
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r2c6171c45fe80090abcff004a03b8023196a7fe7 -rae99d19be5c1bd59e6cc85669c96a3b9895e660d
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 2c6171c45fe80090abcff004a03b8023196a7fe7)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
@@ -24,4 +24,4 @@
 
 [assembly: AssemblyTitle("Demo.Ringtoets.Test")]
 [assembly: AssemblyProduct("Demo.Ringtoets.Test")]
-[assembly: Guid("f150e633-37ce-46a6-828f-e8deaf134096")]
+[assembly: Guid("f150e633-37ce-46a6-828f-e8deaf134096")]
\ No newline at end of file