diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c9bc0fd..dea2214 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions-rust-lang/rustfmt@v1
       - name: Run tests
         run: |
+          sudo rmmod mlx5_ib
           cd ${{ github.workspace }}
           sudo apt install libibverbs1 librdmacm1
           cargo clippy --all-targets -- -D warnings
diff --git a/examples/cmtime.rs b/examples/cmtime.rs
index 546b82f..a29217b 100644
--- a/examples/cmtime.rs
+++ b/examples/cmtime.rs
@@ -249,7 +249,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let args = Args::parse();
     let mut results: Vec<StageResult> = Vec::new();
 
-    if args.server_address.is_some() {
+    if let Some(server_address) = args.server_address {
         let (resp_tx, resp_rx) = channel();
 
         let _resp_handler = thread::spawn(move || loop {
@@ -306,17 +306,21 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             }
         });
 
-        let ip = IpAddr::from_str(&args.server_address.unwrap()).expect("Invalid IP address");
+        let ip = IpAddr::from_str(&server_address).expect("Invalid IP address");
         let server_addr = SocketAddr::from((ip, args.port));
 
-        let ip = IpAddr::from_str(&args.bind_address.unwrap()).expect("Invalid IP address");
-        let client_addr = SocketAddr::from((ip, 0));
+        let client_addr = args
+            .bind_address
+            .as_deref()
+            .map(IpAddr::from_str)
+            .transpose()?
+            .map(|ip| SocketAddr::from((ip, 0)));
 
         start_time!(Step::ResolveAddr);
         for node in &nodes {
             start_perf!(node, Step::ResolveAddr);
             if let Some(ref id) = node.lock().unwrap().id {
-                id.resolve_addr(Some(client_addr), server_addr, Duration::new(2, 0))?;
+                id.resolve_addr(client_addr, server_addr, Duration::new(2, 0))?;
                 STARTED[Step::ResolveAddr as usize].fetch_add(1, Ordering::Relaxed);
             }
         }