diff --git a/services/base/AutoDiscServer/libs/auto_disc/utils/leafutils/leafintegrations/tests/test_expedb_locators.py b/services/base/AutoDiscServer/libs/auto_disc/utils/leafutils/leafintegrations/tests/test_expedb_locators.py
index cd0b96c..a69da13 100644
--- a/services/base/AutoDiscServer/libs/auto_disc/utils/leafutils/leafintegrations/tests/test_expedb_locators.py
+++ b/services/base/AutoDiscServer/libs/auto_disc/utils/leafutils/leafintegrations/tests/test_expedb_locators.py
@@ -59,9 +59,8 @@ def mock_checkpoint():
 
 
 def test_ExpeDBLocator_store():
-    bin = b"123 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+    bin = b"123"
     loc = ExpeDBLocator(resource_uri=RESOURCE_URI)
-    print('loc', loc)
     uid = loc.store(bin)
     print('uid', uid)
 
@@ -70,9 +69,11 @@ def test_ExpeDBLocator_store():
     print('mongo_id', mongo_id)
     response_bin = requests.get(RESOURCE_URI + "/" + mongo_id + "/metadata").content
 
+    print('response_bin', response_bin)
+
     response_bin = codecs.decode(response_bin, encoding="base64")
 
-    print('response_bin', response_bin)
+    
 
     assert response_bin == bin
 
@@ -126,11 +127,18 @@ def test_ExpeDBLinearLocator_store():
     bin = saver.serialize()
     dbname, _ = FileLinearLocator.parse_bin(bin)
 
+    print("dbname", dbname)
+
     # delete doc if exists
     response_arr = expedb_locators._query_uid(RESOURCE_URI, dbname)
-    mongo_id = response_arr[0]["_id"]
-    entrypoint_url = os.path.join(RESOURCE_URI, mongo_id)
-    requests.delete(entrypoint_url)
+    if len(response_arr)==1:
+        mongo_id = response_arr[0]["_id"]
+        entrypoint_url = os.path.join(RESOURCE_URI, mongo_id)
+        requests.delete(entrypoint_url)
+    elif len(response_arr)>1:
+        raise Exception("Weird, there are multiple documents with the same name")
+
+
 
     # store
     loc = ExpeDBLinearLocator(resource_uri=RESOURCE_URI)
diff --git a/services/base/ExpeDB/API/flask_app/app.py b/services/base/ExpeDB/API/flask_app/app.py
index 9b4ff08..a107d22 100644
--- a/services/base/ExpeDB/API/flask_app/app.py
+++ b/services/base/ExpeDB/API/flask_app/app.py
@@ -71,7 +71,7 @@ def _get_file_from_document(document, filename, _filename: str = ""):
     else:
         try:
             print("filename", filename, file=sys.stderr)
-            file = fs.get(document[filename])
+            file = fs.get(ObjectId(document[filename]))
         except:
             # if can't find file, try to follow pointer one level
             new_filename = str(document[filename])