diff --git a/C#/TestApp/TestDevices.cs b/C#/TestApp/Helpers/TestDevices.cs
similarity index 100%
rename from C#/TestApp/TestDevices.cs
rename to C#/TestApp/Helpers/TestDevices.cs
diff --git a/C#/TestApp/KeyboardAndMouseTester.cs b/C#/TestApp/KeyboardAndMouseTester.cs
new file mode 100644
index 0000000..b6368ef
--- /dev/null
+++ b/C#/TestApp/KeyboardAndMouseTester.cs
@@ -0,0 +1,47 @@
+using AutoHotInterception;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TestApp.Helpers;
+
+namespace TestApp
+{
+    /// <summary>
+    /// Allows testing of Keyboard all keys and mouse movement at the same time
+    /// </summary>
+    public class KeyboardAndMouseTester
+    {
+        private Manager im = new Manager();
+
+        public KeyboardAndMouseTester(TestDevice testDevice, bool block = false)
+        {
+            AddDevice(testDevice, block);
+        }
+
+        public KeyboardAndMouseTester AddDevice(TestDevice testDevice, bool block = false)
+        {
+            var devId = testDevice.GetDeviceId();
+
+            if (devId == 0) return this;
+            if (devId < 11)
+            {
+                im.SubscribeKeyboard(devId, block, new Action<ushort, int>((code, value) =>
+                {
+                    var keyObj = AhkKeys.Obj(code);
+
+                    Console.WriteLine($"Name: {keyObj.Name}, Code: {keyObj.LogCode()}, State: {value}");
+                }));
+            }
+            else
+            {
+                im.SubscribeMouseMove(devId, block, new Action<int, int>((x, y) =>
+                {
+                    Console.WriteLine($"Mouse Move: x: {x}, y: {y}");
+                }));
+            }
+            return this;
+        }
+    }
+}
diff --git a/C#/TestApp/Program.cs b/C#/TestApp/Program.cs
index db44fe9..3d94268 100644
--- a/C#/TestApp/Program.cs
+++ b/C#/TestApp/Program.cs
@@ -11,9 +11,10 @@ namespace TestApp
             //var mbt = new MouseButtonTester(TestDevices.LogitechWheelMouse, MouseButtons.Left, true);
             //var ambt = new MouseButtonsTester(TestDevices.LogitechWheelMouse, true);
             //var kt = new KeyboardTester(TestDevices.WyseKeyboard, true);
+            var kmt = new KeyboardAndMouseTester(TestDevices.WyseKeyboard, true).AddDevice(TestDevices.LogitechWheelMouse, true);
             //var kkt = new KeyboardKeyTester(TestDevices.WyseKeyboard, AhkKeys.Obj("1"), true);
             //var tt = new TabletTester(TestDevices.ParbloIslandA609);
-            var sct = new ScanCodeTester(TestDevices.WyseKeyboard, true);
+            //var sct = new ScanCodeTester(TestDevices.WyseKeyboard, true);
             //var sst = new SetStateTester(TestDevices.WyseKeyboard, AhkKeys.Obj("1"));
             Console.ReadLine();
         }
diff --git a/C#/TestApp/TestApp.csproj b/C#/TestApp/TestApp.csproj
index 5af8b14..3698f00 100644
--- a/C#/TestApp/TestApp.csproj
+++ b/C#/TestApp/TestApp.csproj
@@ -44,8 +44,9 @@
   <ItemGroup>
     <Compile Include="Helpers\AhkKeys.cs" />
     <Compile Include="Helpers\MouseButtons.cs" />
+    <Compile Include="KeyboardAndMouseTester.cs" />
     <Compile Include="MouseButtonTester.cs" />
-    <Compile Include="TestDevices.cs" />
+    <Compile Include="Helpers\TestDevices.cs" />
     <Compile Include="KeyboardTester.cs" />
     <Compile Include="KeyboardKeyTester.cs" />
     <Compile Include="MouseButtonsTester.cs" />