Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r659a905aa024b3d1cd02b7f832da26524e5f0bc1
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 659a905aa024b3d1cd02b7f832da26524e5f0bc1)
@@ -174,7 +174,7 @@
 
         [Test]
         [TestCaseSource(nameof(ChartDataLegendImages))]
-        public void Image_WrappedDataChartPointData_ReturnPointsIcon(ChartData chartData, Image expectedImage)
+        public void Image_WrappedDataChartPointData_ReturnsExpectedImage(ChartData chartData, Image expectedImage)
         {
             // Setup            
             ChartDataContext context = GetContext(chartData);
@@ -300,7 +300,7 @@
 
         [Test]
         [TestCaseSource(nameof(IsCheckedChartData))]
-        public void OnNodeChecked_Always_SetsPointDataVisibilityAndNotifiesParentObservers(ChartData chartData, bool initialVisibleState)
+        public void OnNodeChecked_Always_SetsChartDataVisibilityAndNotifiesParentObservers(ChartData chartData, bool initialVisibleState)
         {
             // Setup
             var observer = mocks.StrictMock<IObserver>();
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r6045128a21a5e8b1c6e1e48471749eb3da39b89d -r659a905aa024b3d1cd02b7f832da26524e5f0bc1
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 6045128a21a5e8b1c6e1e48471749eb3da39b89d)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 659a905aa024b3d1cd02b7f832da26524e5f0bc1)
@@ -304,7 +304,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_MapDataCollectionWithVisibleFeatureBasedmapData_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_MapDataCollectionWithVisibleFeatureBasedMapData_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mapPointData = new MapPointData("test")
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf75bf6c108f023b3f8c020cf51e0686d500bb342 -r659a905aa024b3d1cd02b7f832da26524e5f0bc1
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataContextTreeNodeInfoTest.cs	(.../MapDataContextTreeNodeInfoTest.cs)	(revision f75bf6c108f023b3f8c020cf51e0686d500bb342)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataContextTreeNodeInfoTest.cs	(.../MapDataContextTreeNodeInfoTest.cs)	(revision 659a905aa024b3d1cd02b7f832da26524e5f0bc1)
@@ -168,7 +168,7 @@
 
         [Test]
         [TestCaseSource(nameof(MapDataLegendImages))]
-        public void Image_WrappedDataMapPointData_ReturnPointsIcon(MapData mapData, Image expectedImage)
+        public void Image_WrappedDataMapPointData_ReturnExpectedImage(MapData mapData, Image expectedImage)
         {
             // Setup            
             MapDataContext context = GetContext(mapData);
@@ -280,7 +280,7 @@
 
         [Test]
         [TestCaseSource(nameof(IsCheckedMapData))]
-        public void OnNodeChecked_Always_SetsPointDataVisibilityAndNotifiesParentObservers(MapData mapData, bool initialVisibleState)
+        public void OnNodeChecked_Always_SetsMapDataVisibilityAndNotifiesParentObservers(MapData mapData, bool initialVisibleState)
         {
             // Setup
             var observer = mocks.StrictMock<IObserver>();
Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs
===================================================================
diff -u -red92d5353ea8138720874c61c353fd70fd12d3d0 -r659a905aa024b3d1cd02b7f832da26524e5f0bc1
--- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs	(.../MapDataContextTest.cs)	(revision ed92d5353ea8138720874c61c353fd70fd12d3d0)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs	(.../MapDataContextTest.cs)	(revision 659a905aa024b3d1cd02b7f832da26524e5f0bc1)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void Constructor_ParentChartDataNull_ThrowsArgumentNullException()
+        public void Constructor_ParentMapDataNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () => new MapDataContext(new TestMapData(), null);