review updates

Author: abr-egn

src/client/options/mod.rs

@@ -1234,16 +1234,13 @@ impl ClientOptions {
                 server_api,
                 server_selection_timeout,
                 socket_timeout,
+                test_options,
                 tls,
                 write_concern,
                 original_srv_info,
                 original_uri
             ]
         );
-        #[cfg(test)]
-        {
-            merge_options!(other, self, [test_options]);
-        }
     }
 
     #[cfg(test)]

src/test/spec/retryable_writes/mod.rs

@@ -180,7 +180,7 @@ async fn run_spec_tests() {
                     .unwrap();
             }
 
-            let _ = client.database(&db_name).drop(None).await;
+            client.database(&db_name).drop(None).await.unwrap();
         }
     }