diff --git a/.cruft.json b/.cruft.json
index 54387a2..b49f4d0 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/iterative/cookiecutter-dvc-plugin/",
-  "commit": "ee8c646aba8e19e95a8fb9508d2928771a95a2a1",
+  "commit": "1365e60510d657a05371486b62233a6bc3037af5",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/dvc_s3/tests/test_dvc.py.rej b/dvc_s3/tests/test_dvc.py.rej
new file mode 100644
index 0000000..ce800db
--- /dev/null
+++ b/dvc_s3/tests/test_dvc.py.rej
@@ -0,0 +1,86 @@
+diff a/dvc_s3/tests/test_dvc.py b/dvc_s3/tests/test_dvc.py	(rejected hunks)
+@@ -5,52 +5,58 @@ from dvc.testing.api_tests import (  # noqa, pylint: disable=unused-import
+ from dvc.testing.remote_tests import (  # noqa, pylint: disable=unused-import
+     TestRemote,
+ )
++from dvc.testing.workspace_tests import TestAdd as _TestAdd
+ from dvc.testing.workspace_tests import (  # noqa, pylint: disable=unused-import
+-    TestAdd,
+-    TestImport,
++    TestGetUrl,
++)
++from dvc.testing.workspace_tests import TestImport as _TestImport
++from dvc.testing.workspace_tests import (  # noqa, pylint: disable=unused-import
++    TestLsUrl,
+ )
+ 
+ 
+ @pytest.fixture
+-def cloud_name():
+-    return "s3"
++def cloud(make_cloud):
++    yield make_cloud(typ="s3")
+ 
+ 
+ @pytest.fixture
+-def remote(make_remote, cloud_name):
+-    yield make_remote(name="upstream", typ=cloud_name)
++def remote(make_remote):
++    yield make_remote(name="upstream", typ="s3")
+ 
+ 
+ @pytest.fixture
+-def workspace(make_workspace, cloud_name):
+-    yield make_workspace(name="workspace", typ=cloud_name)
++def workspace(make_workspace):
++    yield make_workspace(name="workspace", typ="s3")
+ 
+ 
+-@pytest.fixture
+-def stage_md5():
+-    raise NotImplementedError
++class TestImport(_TestImport):
++    @pytest.fixture
++    def stage_md5(self):
++        raise NotImplementedError
+ 
+ 
+-@pytest.fixture
+-def is_object_storage():
+-    raise NotImplementedError
++    @pytest.fixture
++    def is_object_storage(self):
++        raise NotImplementedError
+ 
+ 
+-@pytest.fixture
+-def dir_md5():
+-    raise NotImplementedError
++    @pytest.fixture
++    def dir_md5(self):
++        raise NotImplementedError
+ 
+ 
+-@pytest.fixture
+-def hash_name():
+-    raise NotImplementedError
++class TestAdd(_TestAdd):
++    @pytest.fixture
++    def hash_name(self):
++        raise NotImplementedError
+ 
+ 
+-@pytest.fixture
+-def hash_value():
+-    raise NotImplementedError
++    @pytest.fixture
++    def hash_value(self):
++        raise NotImplementedError
+ 
+ 
+-@pytest.fixture
+-def dir_hash_value(dir_md5):
+-    raise NotImplementedError
++    @pytest.fixture
++    def dir_hash_value(self):
++        raise NotImplementedError