diff --git a/FlippR-Driver/tests/input/TestEventNotifier.cpp b/FlippR-Driver/tests/input/TestEventNotifier.cpp
index 5ebd61d..6f64973 100644
--- a/FlippR-Driver/tests/input/TestEventNotifier.cpp
+++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp
@@ -108,7 +108,7 @@ SCENARIO("The EventHandler gets notified")
     Event event(0, 0, "test");
 
     Mock<IEventHandler> event_handler_mock;
-    When(Method(event_handler_mock, handle)).AlwaysReturn();
+    When(Method(event_handler_mock, handle)).AlwaysDo([](Event e){std::cout << "called handle\n";});
     Fake(Dtor(event_handler_mock));
 
     Event test_event(0, 0, "test");
@@ -120,6 +120,7 @@ SCENARIO("The EventHandler gets notified")
     EventNotifier notifier;
 
     notifier.event_queue = &(queue_mock.get());
+    notifier.event_handlers.insert(&(event_handler_mock.get()));
 
     WHEN("The event gets queued")
     {