diff --git a/src/context.rs b/src/context.rs
index 81b44dae2..e5cbee747 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -4,7 +4,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::ffi::OsString;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, Ordering};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
diff --git a/src/test_utils.rs b/src/test_utils.rs
index f1b0bbc60..5cca0bf7c 100644
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -785,6 +785,17 @@ impl TestContext {
 
         chat_id
     }
+
+    /// Clears event queue.
+    /// Works by emitting a `TestCheckpointEvent` and consuming all events until.
+    /// times out after 10 seconds.
+    pub async fn clear_events(&self) {
+        let event_id = self.emit_test_checkpoint_event().await;
+        self.evtracker.get_matching(|ev| match ev {
+            EventType::TestCheckpointEvent { id } => event_id == *id,
+            _ => false
+        }).await;
+    }
 }
 
 impl Deref for TestContext {