diff --git a/tests/basic_timers.nim b/tests/basic_timers.nim
index 1bd4cbe..efc14d3 100644
--- a/tests/basic_timers.nim
+++ b/tests/basic_timers.nim
@@ -10,6 +10,7 @@
 import std/asyncdispatch
 import std/locks
 import ../raft/types
+import uuids
 
 export asyncdispatch
 
@@ -48,13 +49,15 @@ proc RaftTimerCancelCustomImpl*(timer: RaftTimer): bool {.nimcall, gcsafe, disca
 proc RaftTimerPollThread() {.thread, nimcall, gcsafe.} =
   while running:
     try:
+
       poll()
+      debugEcho activeDescriptors()
     except ValueError as e:
-      # debugEcho e.msg
+      debugEcho e.msg
       # Add a 'dummy' timer if no other handles are present to prevent more
       # ValueError exceptions this is a workaround for a asyncdyspatch bug
       # see - https://github.com/nim-lang/Nim/issues/14564
-      addTimer(1, false, proc (fd: AsyncFD): bool {.closure, gcsafe.} = false)
+      addTimer(10000, false, proc (fd: AsyncFD): bool {.closure, gcsafe.} = false)
 
 proc RaftTimerJoinPollThread*() {.nimcall, gcsafe.} =
   joinThread(pollThr)
diff --git a/tests/basic_timers_test.nim b/tests/basic_timers_test.nim
index 1c29bac..d8f1612 100644
--- a/tests/basic_timers_test.nim
+++ b/tests/basic_timers_test.nim
@@ -16,11 +16,11 @@ import random
 const
   MAX_TIMERS = 50
   SLOW_TIMERS_MIN = 300
-  SLOW_TIMERS_MAX = 350
-  FAST_TIMERS_MIN = 20
-  FAST_TIMERS_MAX = 150
-  WAIT_FOR_SLOW_TIMERS = 225
-  FINAL_WAIT = 125
+  SLOW_TIMERS_MAX = 400
+  FAST_TIMERS_MIN = 10
+  FAST_TIMERS_MAX = 100
+  WAIT_FOR_SLOW_TIMERS = 200
+  FINAL_WAIT = 300
 
 proc timersRunner() =
   var
@@ -32,31 +32,41 @@ proc timersRunner() =
       discard
 
   suite "Create and test basic timers":
+
     test "Start timers":
       RaftTimerStartCustomImpl(false)
-      check true
-    test "Create 'slow' timers":
+
+    test "Create 'slow' and 'fast' timers":
       for i in 0..MAX_TIMERS:
         slowTimers[i] = RaftTimerCreateCustomImpl(max(SLOW_TIMERS_MIN, rand(SLOW_TIMERS_MAX)), true, RaftDummyTimerCallback)
-      check true
-    test "Create 'fast' timers":
+
       for i in 0..MAX_TIMERS:
         fastTimers[i] = RaftTimerCreateCustomImpl(max(FAST_TIMERS_MIN, rand(FAST_TIMERS_MAX)), true, RaftDummyTimerCallback)
-      check true
+
     test "Wait for and cancel 'slow' timers":
-      waitFor sleepAsync(WAIT_FOR_SLOW_TIMERS)
+      var fut = sleepAsync(WAIT_FOR_SLOW_TIMERS)
+      while not fut.finished:
+        discard
       for i in 0..MAX_TIMERS:
         RaftTimerCancelCustomImpl(slowTimers[i])
-      check true
+
     test "Wait and stop timers":
       waitFor sleepAsync(FINAL_WAIT)
-      RaftTimerStopCustomImpl(true)
-      check true
+      RaftTimerStopCustomImpl()
+
     test "Check timers consistency":
+      var
+        pass = true
+
       for i in 0..MAX_TIMERS:
-        if not fastTimers[i].expired or not slowTimers[i].canceled:
-          check false
-      check true
+        if not fastTimers[i].expired:
+          pass = false
+          break
+        if not slowTimers[i].canceled:
+          pass = false
+          break
+
+      check pass
 
 if isMainModule:
   timersRunner()
\ No newline at end of file