Index: Core/Common/test/Core.Common.Controls.TreeView.Test/Core.Common.Controls.TreeView.Test.csproj
===================================================================
diff -u -rf02506e58ebeecd95383ae12f4df2570ae5af17c -rc8813d252befec1494a76e44e04b64985b34d7fc
--- Core/Common/test/Core.Common.Controls.TreeView.Test/Core.Common.Controls.TreeView.Test.csproj	(.../Core.Common.Controls.TreeView.Test.csproj)	(revision f02506e58ebeecd95383ae12f4df2570ae5af17c)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/Core.Common.Controls.TreeView.Test.csproj	(.../Core.Common.Controls.TreeView.Test.csproj)	(revision c8813d252befec1494a76e44e04b64985b34d7fc)
@@ -55,6 +55,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DragDropHandlerTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TreeNodeInfoTest.cs" />
     <Compile Include="TreeViewControlTest.cs" />
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/DragDropHandlerTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Controls.TreeView.Test/DragDropHandlerTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/DragDropHandlerTest.cs	(revision c8813d252befec1494a76e44e04b64985b34d7fc)
@@ -0,0 +1,51 @@
+using System;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.Controls.TreeView.Test
+{
+    [TestFixture]
+    public class DragDropHandlerTest
+    {
+        [Test]
+        public void HandleItemDrag_WithItemInTree_SelectsItem()
+        {
+            // Setup
+            DragDropHandler ddh = new DragDropHandler();
+            Func<object, TreeNodeInfo> action = o => new TreeNodeInfo();
+            var treeNode = new TreeNode();
+            ItemDragEventArgs dragEvent = new ItemDragEventArgs(MouseButtons.Left, treeNode);
+            System.Windows.Forms.TreeView treeView = new System.Windows.Forms.TreeView();
+
+            treeView.Nodes.Add(treeNode);
+            treeView.SelectedNode = null;
+
+            // Call
+            ddh.HandleItemDrag(treeView, dragEvent, action);
+
+            // Assert
+            Assert.AreSame(treeNode, treeView.SelectedNode);
+        }
+
+        [Test]
+        public void HandleItemDrag_WithItemNotInTree_SelectsNull()
+        {
+            // Setup
+            DragDropHandler ddh = new DragDropHandler();
+            Func<object, TreeNodeInfo> action = o => new TreeNodeInfo();
+            var draggingNode = new TreeNode();
+            var treeNode = new TreeNode();
+            ItemDragEventArgs dragEvent = new ItemDragEventArgs(MouseButtons.Left, draggingNode);
+            System.Windows.Forms.TreeView treeView = new System.Windows.Forms.TreeView();
+
+            treeView.Nodes.Add(treeNode);
+            treeView.SelectedNode = treeNode;
+
+            // Call
+            ddh.HandleItemDrag(treeView, dragEvent, action);
+
+            // Assert
+            Assert.IsNull(treeView.SelectedNode);
+        }
+    }
+}
\ No newline at end of file