Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/AreaDataTreeNodeInfoTest.cs
===================================================================
diff -u -rf5fba362fd622350af428420089c20f80f218b78 -r9b450b308a40796dd97a4d07b2a191973326cc96
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/AreaDataTreeNodeInfoTest.cs	(.../AreaDataTreeNodeInfoTest.cs)	(revision f5fba362fd622350af428420089c20f80f218b78)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/AreaDataTreeNodeInfoTest.cs	(.../AreaDataTreeNodeInfoTest.cs)	(revision 9b450b308a40796dd97a4d07b2a191973326cc96)
@@ -27,9 +27,9 @@
             legendView = new LegendView();
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
-            var treeNodeInfos = TypeUtils.GetField<IEnumerable<TreeNodeInfo>>(treeViewControl, "treeNodeInfos");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
-            info = treeNodeInfos.First(tni => tni.TagType == typeof(AreaData));
+            info = treeNodeInfoLookup[typeof(AreaData)];
         }
 
         [Test]
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r3e8e68859b459b44180950af5bf1b62617b5c0f8 -r9b450b308a40796dd97a4d07b2a191973326cc96
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 3e8e68859b459b44180950af5bf1b62617b5c0f8)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 9b450b308a40796dd97a4d07b2a191973326cc96)
@@ -28,9 +28,9 @@
             legendView = new LegendView();
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
-            var treeNodeInfos = TypeUtils.GetField<IEnumerable<TreeNodeInfo>>(treeViewControl, "treeNodeInfos");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
-            info = treeNodeInfos.First(tni => tni.TagType == typeof(ChartDataCollection));
+            info = treeNodeInfoLookup[typeof(ChartDataCollection)];
         }
 
         [Test]
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs
===================================================================
diff -u -rf5fba362fd622350af428420089c20f80f218b78 -r9b450b308a40796dd97a4d07b2a191973326cc96
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs	(.../LineDataTreeNodeInfoTest.cs)	(revision f5fba362fd622350af428420089c20f80f218b78)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs	(.../LineDataTreeNodeInfoTest.cs)	(revision 9b450b308a40796dd97a4d07b2a191973326cc96)
@@ -27,9 +27,9 @@
             legendView = new LegendView();
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
-            var treeNodeInfos = TypeUtils.GetField<IEnumerable<TreeNodeInfo>>(treeViewControl, "treeNodeInfos");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
-            info = treeNodeInfos.First(tni => tni.TagType == typeof(LineData));
+            info = treeNodeInfoLookup[typeof(LineData)];
         }
 
         [Test]
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/PointDataTreeNodeInfoTest.cs
===================================================================
diff -u -rf5fba362fd622350af428420089c20f80f218b78 -r9b450b308a40796dd97a4d07b2a191973326cc96
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/PointDataTreeNodeInfoTest.cs	(.../PointDataTreeNodeInfoTest.cs)	(revision f5fba362fd622350af428420089c20f80f218b78)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/PointDataTreeNodeInfoTest.cs	(.../PointDataTreeNodeInfoTest.cs)	(revision 9b450b308a40796dd97a4d07b2a191973326cc96)
@@ -27,9 +27,9 @@
             legendView = new LegendView();
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
-            var treeNodeInfos = TypeUtils.GetField<IEnumerable<TreeNodeInfo>>(treeViewControl, "treeNodeInfos");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
-            info = treeNodeInfos.First(tni => tni.TagType == typeof(PointData));
+            info = treeNodeInfoLookup[typeof(PointData)];
         }
 
         [Test]