diff --git a/tests/test_elements_worker/test_entities.py b/tests/test_elements_worker/test_entities.py
index 2774e15e2ddf38ec84e9fa7ef098b6467a4ef429..70ca37699b807b416510f5854e53755f9aa4ab25 100644
--- a/tests/test_elements_worker/test_entities.py
+++ b/tests/test_elements_worker/test_entities.py
@@ -659,6 +659,9 @@ def test_list_transcription_entities(fake_dummy_worker):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> a8b7730... Modif code with the review
 =======
 >>>>>>> a8b7730... Modif code with the review
 @pytest.mark.parametrize(
@@ -672,6 +675,7 @@ def test_list_transcription_entities(fake_dummy_worker):
     ],
 )
 def test_list_corpus_entities(fake_dummy_worker, name, parent):
+<<<<<<< HEAD
 <<<<<<< HEAD
     corpus = Corpus({"id": "fake_corpus_id"})
     query_params = {}
@@ -722,20 +726,31 @@ def test_list_corpus_entities(fake_dummy_worker):
 >>>>>>> a8b7730... Modif code with the review
 =======
 def test_list_corpus_entities(fake_dummy_worker):
+=======
+>>>>>>> a8b7730... Modif code with the review
     corpus = Corpus({"id": "fake_corpus_id"})
-    name = "fake_name"
-    parent = "fake_parent"
+    query_params = {}
+    if name is not None:
+        query_params["name"] = name
+    if parent is not None:
+        query_params["parent"] = parent
+        if type(parent) == Element:
+            query_params["parent"] = parent.id
+
     fake_dummy_worker.api_client.add_response(
         "ListCorpusEntities",
         id=corpus.id,
-        name=name,
-        parent=parent,
         response={"id": "fake_entity_id"},
+        **query_params,
     )
-    assert fake_dummy_worker.list_corpus_entities(corpus, name, parent) == {
+
+    assert fake_dummy_worker.list_corpus_entities(corpus, **query_params) == {
         "id": "fake_entity_id"
     }
+<<<<<<< HEAD
 
 >>>>>>> fb7d0b7... Add a list_corpus_entities() method to entity.py
+=======
+>>>>>>> a8b7730... Modif code with the review
     assert len(fake_dummy_worker.api_client.history) == 1
     assert len(fake_dummy_worker.api_client.responses) == 0