diff --git a/src/test_controls/package.xml b/src/test_controls/package.xml
index 06506d70..5369227f 100644
--- a/src/test_controls/package.xml
+++ b/src/test_controls/package.xml
@@ -7,6 +7,9 @@
   <maintainer email="semmer99@gmail.com">ubuntu</maintainer>
   <license>TODO: License declaration</license>
 
+  <exec_depend>rclpy</exec_depend>
+  <exec_depend>drone_services</exec_depend>
+
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
diff --git a/src/test_controls/test_controls/test_controller.py b/src/test_controls/test_controls/test_controller.py
index e69de29b..96a3a266 100644
--- a/src/test_controls/test_controls/test_controller.py
+++ b/src/test_controls/test_controls/test_controller.py
@@ -0,0 +1,75 @@
+import rclpy
+from rclpy.node import Node
+
+from pynput.keyboard import KeyCode
+from pynput import keyboard
+
+from drone_services.srv import SetAttitude
+
+
+class TestController(Node):
+
+    def __init__(self):
+        super().__init__('test_controller')
+        self.cli = self.create_client(SetAttitude, 'drone/set_attitude')
+        while not self.cli.wait_for_service(timeout_sec=1.0):
+            self.get_logger().info('service not available, waiting again...')
+        self.req = SetAttitude.Request()
+
+    def spin(self):
+        with keyboard.Listener(on_press=self.on_press, on_release=self.on_release) as listener:
+            while rclpy.ok() and listener.running:
+                rclpy.spin_once(self, timeout_sec=0.1)
+
+    def send_request(self, yaw, pitch, roll, thrust):
+        self.req.yaw = yaw
+        self.req.pitch = pitch
+        self.req.roll = roll
+        self.req.thrust = thrust
+        self.get_logger().info('set request to %f %f %f %f' % (yaw, pitch, roll, thrust))
+        self.future = self.cli.call_async(self.req)
+        rclpy.spin_until_future_complete(self, self.future)
+        self.get_logger().info('publishing message on service')
+        return self.future.result()
+
+    def on_press(self, key):
+        try:
+            char = getattr(key, 'char', None)
+            if isinstance(char, str):
+                self.logger.info('pressed ' + char)
+                self.pub_glyph.publish(self.pub_glyph.msg_type(data=char))
+            else:
+                try:
+                    # known keys like spacebar, ctrl
+                    name = key.name
+                    vk = key.value.vk
+                except AttributeError:
+                    # unknown keys like headphones skip song button
+                    name = 'UNKNOWN'
+                    vk = key.vk
+                self.logger.info('pressed {} ({})'.format(name, vk))
+        except Exception as e:
+            self.logger.error(str(e))
+            raise
+
+        if key == keyboard.Key.esc:
+            self.logger.info('stopping listener')
+            raise keyboard.Listener.StopException
+
+
+def main(args=None):
+    rclpy.init(args=args)
+
+    test_controller = TestController()
+
+    test_controller.spin()
+
+    # Destroy the node explicitly
+    # (optional - otherwise it will be done automatically
+    # when the garbage collector destroys the node object)
+    test_controller.destroy_node()
+    rclpy.shutdown()
+
+
+if __name__ == '__main__':
+    main()