diff --git a/src/Relays/Relays.c b/src/Relays/Relays.c
index 5be67b1..93fc2ec 100644
--- a/src/Relays/Relays.c
+++ b/src/Relays/Relays.c
@@ -6,13 +6,18 @@
  */
 
 #include "Relays.h"
+
+#ifndef UNIT_TESTING
 #include "timer.h"
+#else
+#include "TimerMock.h"
+#endif
 
 void Relay_MeasureMakeTime(Relay *relay) {
   Timer_Start();
-  while (Relay_ReadState(relay)) {
+  while (!Relay_ReadState(relay)) {
   }
-  Timer_Disable();
+  Timer_Stop();
   relay->make_time = Timer_GetOverflowCount();
 }
 
@@ -20,8 +25,8 @@ void Relay_MeasureBreakTime(Relay *relay) {
   Timer_Start();
   while (Relay_ReadState(relay)) {
   }
-  Timer_Disable();
-  relay->make_time = Timer_GetOverflowCount();
+  Timer_Stop();
+  relay->break_time = Timer_GetOverflowCount();
 }
 
 void Relay_Enable(Relay *relay) {