diff --git a/meilisearch-lib/src/dump/handler.rs b/meilisearch-lib/src/dump/handler.rs
index 4adb7011a..830bf4d0d 100644
--- a/meilisearch-lib/src/dump/handler.rs
+++ b/meilisearch-lib/src/dump/handler.rs
@@ -121,7 +121,6 @@ mod real {
 
 #[cfg(test)]
 mod test {
-    use std::marker::PhantomData;
     use std::path::PathBuf;
     use std::sync::Arc;
 
@@ -137,12 +136,12 @@ mod test {
 
     pub enum MockDumpHandler<U, I> {
         Real(super::real::DumpHandler<U, I>),
-        Mock(Mocker, PhantomData<(U, I)>),
+        Mock(Mocker),
     }
 
     impl<U, I> MockDumpHandler<U, I> {
         pub fn mock(mocker: Mocker) -> Self {
-            Self::Mock(mocker, PhantomData)
+            Self::Mock(mocker)
         }
     }
 
@@ -173,7 +172,7 @@ mod test {
         pub async fn run(&self, uid: String) -> Result<()> {
             match self {
                 DumpHandler::Real(real) => real.run(uid).await,
-                DumpHandler::Mock(mocker, _) => unsafe { mocker.get("run").call(uid) },
+                DumpHandler::Mock(mocker) => unsafe { mocker.get("run").call(uid) },
             }
         }
     }
diff --git a/meilisearch-lib/src/index_resolver/error.rs b/meilisearch-lib/src/index_resolver/error.rs
index 6c86aa6b8..610ec6c7c 100644
--- a/meilisearch-lib/src/index_resolver/error.rs
+++ b/meilisearch-lib/src/index_resolver/error.rs
@@ -5,7 +5,7 @@ use tokio::sync::mpsc::error::SendError as MpscSendError;
 use tokio::sync::oneshot::error::RecvError as OneshotRecvError;
 use uuid::Uuid;
 
-use crate::{error::MilliError, index::error::IndexError};
+use crate::{error::MilliError, index::error::IndexError, update_file_store::UpdateFileStoreError};
 
 pub type Result<T> = std::result::Result<T, IndexResolverError>;
 
@@ -49,7 +49,8 @@ internal_error!(
     uuid::Error,
     std::io::Error,
     tokio::task::JoinError,
-    serde_json::Error
+    serde_json::Error,
+    UpdateFileStoreError
 );
 
 impl ErrorCode for IndexResolverError {
diff --git a/meilisearch-lib/src/index_resolver/mod.rs b/meilisearch-lib/src/index_resolver/mod.rs
index 7eb564376..3d76f3b6c 100644
--- a/meilisearch-lib/src/index_resolver/mod.rs
+++ b/meilisearch-lib/src/index_resolver/mod.rs
@@ -27,8 +27,12 @@ use self::meta_store::IndexMeta;
 
 pub type HardStateIndexResolver = IndexResolver<HeedMetaStore, MapIndexStore>;
 
+#[cfg(not(test))]
 pub use real::IndexResolver;
 
+#[cfg(test)]
+pub use test::MockIndexResolver as IndexResolver;
+
 /// An index uid is composed of only ascii alphanumeric characters, - and _, between 1 and 400
 /// bytes long
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
@@ -102,9 +106,9 @@ mod real {
     use super::*;
 
     pub struct IndexResolver<U, I> {
-        index_uuid_store: U,
-        index_store: I,
-        pub file_store: UpdateFileStore,
+        pub(super) index_uuid_store: U,
+        pub(super) index_store: I,
+        pub(super) file_store: UpdateFileStore,
     }
 
     impl IndexResolver<HeedMetaStore, MapIndexStore> {
@@ -230,6 +234,11 @@ mod real {
             }
         }
 
+        pub async fn delete_content_file(&self, content_uuid: Uuid) -> Result<()> {
+            self.file_store.delete(content_uuid).await?;
+            Ok(())
+        }
+
         pub async fn process_task(&self, task: &Task) -> Result<TaskResult> {
             match &task.content {
                 TaskContent::DocumentAddition { .. } => {
@@ -448,6 +457,105 @@ mod test {
     // use index_store::MockIndexStore;
     // use meta_store::MockIndexMetaStore;
 
+    pub enum MockIndexResolver<U, I> {
+        Real(super::real::IndexResolver<U, I>),
+        Mock(Mocker),
+    }
+
+    impl MockIndexResolver<HeedMetaStore, MapIndexStore> {
+        pub fn load_dump(
+            src: impl AsRef<Path>,
+            dst: impl AsRef<Path>,
+            index_db_size: usize,
+            env: Arc<Env>,
+            indexer_opts: &IndexerOpts,
+        ) -> anyhow::Result<()> {
+            super::real::IndexResolver::load_dump(src, dst, index_db_size, env, indexer_opts)
+        }
+    }
+
+    impl<U, I> MockIndexResolver<U, I>
+    where
+        U: IndexMetaStore,
+        I: IndexStore,
+    {
+        pub fn new(index_uuid_store: U, index_store: I, file_store: UpdateFileStore) -> Self {
+            Self::Real(super::real::IndexResolver {
+                index_uuid_store,
+                index_store,
+                file_store,
+            })
+        }
+
+        pub fn mock(mocker: Mocker) -> Self {
+            Self::Mock(mocker)
+        }
+
+        pub async fn process_document_addition_batch(&self, tasks: Vec<Task>) -> Vec<Task> {
+            match self {
+                IndexResolver::Real(r) => r.process_document_addition_batch(tasks).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        pub async fn process_task(&self, task: &Task) -> Result<TaskResult> {
+            match self {
+                IndexResolver::Real(r) => r.process_task(task).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        pub async fn dump(&self, path: impl AsRef<Path>) -> Result<()> {
+            match self {
+                IndexResolver::Real(r) => r.dump(path).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        /// Get or create an index with name `uid`.
+        pub async fn get_or_create_index(&self, uid: IndexUid, task_id: TaskId) -> Result<Index> {
+            match self {
+                IndexResolver::Real(r) => r.get_or_create_index(uid, task_id).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        pub async fn list(&self) -> Result<Vec<(String, Index)>> {
+            match self {
+                IndexResolver::Real(r) => r.list().await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        pub async fn delete_index(&self, uid: String) -> Result<Index> {
+            match self {
+                IndexResolver::Real(r) => r.delete_index(uid).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        pub async fn get_index(&self, uid: String) -> Result<Index> {
+            match self {
+                IndexResolver::Real(r) => r.get_index(uid).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        pub async fn get_index_creation_task_id(&self, index_uid: String) -> Result<TaskId> {
+            match self {
+                IndexResolver::Real(r) => r.get_index_creation_task_id(index_uid).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+
+        pub async fn delete_content_file(&self, content_uuid: Uuid) -> Result<()> {
+            match self {
+                IndexResolver::Real(r) => r.delete_content_file(content_uuid).await,
+                IndexResolver::Mock(_) => todo!(),
+            }
+        }
+    }
+
     // TODO: ignoring this test, it has become too complex to maintain, and rather implement
     // handler logic test.
     // proptest! {
diff --git a/meilisearch-lib/src/tasks/handlers/index_resolver_handler.rs b/meilisearch-lib/src/tasks/handlers/index_resolver_handler.rs
index 75f0623b2..d313ea33d 100644
--- a/meilisearch-lib/src/tasks/handlers/index_resolver_handler.rs
+++ b/meilisearch-lib/src/tasks/handlers/index_resolver_handler.rs
@@ -38,7 +38,7 @@ where
         if let BatchContent::DocumentsAdditionBatch(ref tasks) = batch.content {
             for task in tasks {
                 if let Some(content_uuid) = task.get_content_uuid() {
-                    if let Err(e) = self.file_store.delete(content_uuid).await {
+                    if let Err(e) = self.delete_content_file(content_uuid).await {
                         log::error!("error deleting update file: {}", e);
                     }
                 }