diff --git a/FlippR-Driver/tests/input/TestInputDriver.cpp b/FlippR-Driver/tests/input/TestInputDriver.cpp
index 52aff97..84aab09 100644
--- a/FlippR-Driver/tests/input/TestInputDriver.cpp
+++ b/FlippR-Driver/tests/input/TestInputDriver.cpp
@@ -26,12 +26,12 @@ SCENARIO("An InputDriver gets created", "[construction}")
     LoggerFactory::CreateInputLogger();
 
     Mock<Input::IDetector> detector_mock;
-    When(Dtor(detector_mock)).AlwaysReturn();
+    Fake(Dtor(detector_mock));
 
     Mock<Input::IEventNotifier> event_notifier_mock;
-    When(Dtor(event_notifier_mock)).AlwaysReturn();
+    Fake(Dtor(event_notifier_mock));
     Mock<IEventHandler> event_handler_mock;
-    When(Dtor(event_handler_mock)).AlwaysReturn();
+    Fake(Dtor(event_handler_mock));
 
     WHEN("The InputDriver gets created")
     {
@@ -52,16 +52,16 @@ SCENARIO("An EventHandler [un]registers at the driver", "[un-register]")
     LoggerFactory::CreateInputLogger();
 
     Mock<Input::IDetector> detector_mock;
-    When(Dtor(detector_mock)).AlwaysReturn();
+    Fake(Dtor(detector_mock));
 
     Mock<IEventHandler> event_handler_mock;
-    When(Method(event_handler_mock, handle)).AlwaysReturn();
-    When(Dtor(event_handler_mock)).AlwaysReturn();
+    Fake(Method(event_handler_mock, handle));
+    Fake(Dtor(event_handler_mock));
 
     Mock<Input::IEventNotifier> event_notifier_mock;
-    When(Method(event_notifier_mock, register_event_handler)).AlwaysReturn();
-    When(Method(event_notifier_mock, unregister_event_handler)).AlwaysReturn();
-    When(Dtor(event_notifier_mock)).AlwaysReturn();
+    Fake(Method(event_notifier_mock, register_event_handler));
+    Fake(Method(event_notifier_mock, unregister_event_handler));
+    Fake(Dtor(event_notifier_mock));
 
     Input::InputDriver input_driver(&event_notifier_mock.get(), &detector_mock.get());
 
@@ -75,9 +75,8 @@ SCENARIO("An EventHandler [un]registers at the driver", "[un-register]")
       }
     }
 
-    WHEN("The EventHandler unregisters at the driver")
+    WHEN("The EventHandler then unregisters at the driver")
     {
-      REQUIRE((bool)Verify(Method(event_notifier_mock, register_event_handler).Using(&event_handler_mock.get())));
       input_driver.unregister_event_handler(&event_handler_mock.get());
 
       THEN("The unregister_event_handler at the event_notifier gets called")