diff --git a/src/db/mysql/models.rs b/src/db/mysql/models.rs
index 0b752979a5..7f9082ed8d 100644
--- a/src/db/mysql/models.rs
+++ b/src/db/mysql/models.rs
@@ -745,7 +745,7 @@ impl MysqlDb {
         .bind::<Integer, _>(TOMBSTONE)
         .load::<UserCollectionsResult>(&self.conn)?
         .into_iter()
-        .map(|cr| SyncTimestamp::from_i64(cr.last_modified).and_then(|ts| Ok((cr.collection, ts))))
+        .map(|cr| SyncTimestamp::from_i64(cr.last_modified).map(|ts| (cr.collection, ts)))
         .collect::<Result<HashMap<_, _>>>()?;
         self.map_collection_names(modifieds)
     }
diff --git a/src/server/test.rs b/src/server/test.rs
index 6c20b26b02..8cb0fa6bc8 100644
--- a/src/server/test.rs
+++ b/src/server/test.rs
@@ -193,11 +193,8 @@ async fn test_endpoint(
     }
 }
 
-async fn test_endpoint_with_response<T>(
-    method: http::Method,
-    path: &str,
-    assertions: &dyn Fn(T) -> (),
-) where
+async fn test_endpoint_with_response<T>(method: http::Method, path: &str, assertions: &dyn Fn(T))
+where
     T: DeserializeOwned,
 {
     let settings = get_test_settings();