diff --git a/tests/conftest.py b/tests/conftest.py
index 5a4858636..6861214a3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,7 +14,6 @@
 import tempfile
 from datajoint import errors
 from datajoint.errors import ADAPTED_TYPE_SWITCH, FILEPATH_FEATURE_SWITCH
-from datajoint.errors import ADAPTED_TYPE_SWITCH, FILEPATH_FEATURE_SWITCH
 from . import (
     PREFIX,
     CONN_INFO,
diff --git a/tests/test_attach.py b/tests/test_attach.py
new file mode 100644
index 000000000..654feef5b
--- /dev/null
+++ b/tests/test_attach.py
@@ -0,0 +1,67 @@
+import pytest
+import tempfile
+from pathlib import Path
+import os
+from .schema_external import Attach
+
+
+def test_attach_attributes(schema_ext, minio_client):
+    """Test saving files in attachments"""
+    # create a mock file
+    table = Attach()
+    source_folder = tempfile.mkdtemp()
+    for i in range(2):
+        attach1 = Path(source_folder, "attach1.img")
+        data1 = os.urandom(100)
+        with attach1.open("wb") as f:
+            f.write(data1)
+        attach2 = Path(source_folder, "attach2.txt")
+        data2 = os.urandom(200)
+        with attach2.open("wb") as f:
+            f.write(data2)
+        table.insert1(dict(attach=i, img=attach1, txt=attach2))
+
+    download_folder = Path(tempfile.mkdtemp())
+    keys, path1, path2 = table.fetch(
+        "KEY", "img", "txt", download_path=download_folder, order_by="KEY"
+    )
+
+    # verify that different attachment are renamed if their filenames collide
+    assert path1[0] != path2[0]
+    assert path1[0] != path1[1]
+    assert Path(path1[0]).parent == download_folder
+    with Path(path1[-1]).open("rb") as f:
+        check1 = f.read()
+    with Path(path2[-1]).open("rb") as f:
+        check2 = f.read()
+    assert data1 == check1
+    assert data2 == check2
+
+    # verify that existing files are not duplicated if their filename matches issue #592
+    p1, p2 = (Attach & keys[0]).fetch1("img", "txt", download_path=download_folder)
+    assert p1 == path1[0]
+    assert p2 == path2[0]
+
+
+def test_return_string(schema_ext, minio_client):
+    """Test returning string on fetch"""
+    # create a mock file
+    table = Attach()
+    source_folder = tempfile.mkdtemp()
+
+    attach1 = Path(source_folder, "attach1.img")
+    data1 = os.urandom(100)
+    with attach1.open("wb") as f:
+        f.write(data1)
+    attach2 = Path(source_folder, "attach2.txt")
+    data2 = os.urandom(200)
+    with attach2.open("wb") as f:
+        f.write(data2)
+    table.insert1(dict(attach=2, img=attach1, txt=attach2))
+
+    download_folder = Path(tempfile.mkdtemp())
+    keys, path1, path2 = table.fetch(
+        "KEY", "img", "txt", download_path=download_folder, order_by="KEY"
+    )
+
+    assert isinstance(path1[0], str)