diff --git a/swh/web/tests/api/views/test_identifiers.py b/swh/web/tests/api/views/test_identifiers.py
index 7d842412..30312470 100644
--- a/swh/web/tests/api/views/test_identifiers.py
+++ b/swh/web/tests/api/views/test_identifiers.py
@@ -1,179 +1,164 @@
 # Copyright (C) 2018-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from hypothesis import given
 
 from swh.model.swhids import ObjectType
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import reverse
 from swh.web.tests.data import random_sha1
-from swh.web.tests.strategies import (
-    unknown_content,
-    unknown_directory,
-    unknown_release,
-    unknown_revision,
-    unknown_snapshot,
-)
 from swh.web.tests.utils import check_api_get_responses, check_api_post_responses
 
 
 def test_swhid_resolve_success(
     api_client, content, directory, origin, release, revision, snapshot
 ):
 
     for obj_type, obj_id in (
         (ObjectType.CONTENT, content["sha1_git"]),
         (ObjectType.DIRECTORY, directory),
         (ObjectType.RELEASE, release),
         (ObjectType.REVISION, revision),
         (ObjectType.SNAPSHOT, snapshot),
     ):
 
         swhid = gen_swhid(obj_type, obj_id, metadata={"origin": origin["url"]})
 
         url = reverse("api-1-resolve-swhid", url_args={"swhid": swhid})
 
         resp = check_api_get_responses(api_client, url, status_code=200)
 
         if obj_type == ObjectType.CONTENT:
             url_args = {"query_string": "sha1_git:%s" % obj_id}
         elif obj_type == ObjectType.SNAPSHOT:
             url_args = {"snapshot_id": obj_id}
         else:
             url_args = {"sha1_git": obj_id}
 
         obj_type_str = obj_type.name.lower()
 
         browse_rev_url = reverse(
             f"browse-{obj_type_str}",
             url_args=url_args,
             query_params={"origin_url": origin["url"]},
             request=resp.wsgi_request,
         )
 
         expected_result = {
             "browse_url": browse_rev_url,
             "metadata": {"origin": origin["url"]},
             "namespace": "swh",
             "object_id": obj_id,
             "object_type": obj_type_str,
             "scheme_version": 1,
         }
 
         assert resp.data == expected_result
 
 
 def test_swhid_resolve_invalid(api_client):
     rev_id_invalid = "96db9023b8_foo_50d6c108e9a3"
     swhid = "swh:1:rev:%s" % rev_id_invalid
     url = reverse("api-1-resolve-swhid", url_args={"swhid": swhid})
     check_api_get_responses(api_client, url, status_code=400)
 
 
-@given(
-    unknown_content(),
-    unknown_directory(),
-    unknown_release(),
-    unknown_revision(),
-    unknown_snapshot(),
-)
 def test_swhid_resolve_not_found(
     api_client,
     unknown_content,
     unknown_directory,
     unknown_release,
     unknown_revision,
     unknown_snapshot,
 ):
 
     for obj_type, obj_id in (
         (ObjectType.CONTENT, unknown_content["sha1_git"]),
         (ObjectType.DIRECTORY, unknown_directory),
         (ObjectType.RELEASE, unknown_release),
         (ObjectType.REVISION, unknown_revision),
         (ObjectType.SNAPSHOT, unknown_snapshot),
     ):
 
         swhid = gen_swhid(obj_type, obj_id)
 
         url = reverse("api-1-resolve-swhid", url_args={"swhid": swhid})
 
         check_api_get_responses(api_client, url, status_code=404)
 
 
 def test_swh_origin_id_not_resolvable(api_client):
     ori_swhid = "swh:1:ori:8068d0075010b590762c6cb5682ed53cb3c13deb"
     url = reverse("api-1-resolve-swhid", url_args={"swhid": ori_swhid})
     check_api_get_responses(api_client, url, status_code=400)
 
 
 def test_api_known_swhid_all_present(
     api_client, content, directory, release, revision, snapshot
 ):
     input_swhids = [
         gen_swhid(ObjectType.CONTENT, content["sha1_git"]),
         gen_swhid(ObjectType.DIRECTORY, directory),
         gen_swhid(ObjectType.REVISION, revision),
         gen_swhid(ObjectType.RELEASE, release),
         gen_swhid(ObjectType.SNAPSHOT, snapshot),
     ]
 
     url = reverse("api-1-known")
 
     resp = check_api_post_responses(api_client, url, data=input_swhids, status_code=200)
 
     assert resp.data == {swhid: {"known": True} for swhid in input_swhids}
 
 
 def test_api_known_swhid_some_present(api_client, content, directory):
     content_ = gen_swhid(ObjectType.CONTENT, content["sha1_git"])
     directory_ = gen_swhid(ObjectType.DIRECTORY, directory)
     unknown_revision_ = gen_swhid(ObjectType.REVISION, random_sha1())
     unknown_release_ = gen_swhid(ObjectType.RELEASE, random_sha1())
     unknown_snapshot_ = gen_swhid(ObjectType.SNAPSHOT, random_sha1())
 
     input_swhids = [
         content_,
         directory_,
         unknown_revision_,
         unknown_release_,
         unknown_snapshot_,
     ]
 
     url = reverse("api-1-known")
 
     resp = check_api_post_responses(api_client, url, data=input_swhids, status_code=200)
 
     assert resp.data == {
         content_: {"known": True},
         directory_: {"known": True},
         unknown_revision_: {"known": False},
         unknown_release_: {"known": False},
         unknown_snapshot_: {"known": False},
     }
 
 
 def test_api_known_invalid_swhid(api_client):
     invalid_swhid_sha1 = ["swh:1:cnt:8068d0075010b590762c6cb5682ed53cb3c13de;"]
     invalid_swhid_type = ["swh:1:cnn:8068d0075010b590762c6cb5682ed53cb3c13deb"]
 
     url = reverse("api-1-known")
 
     check_api_post_responses(api_client, url, data=invalid_swhid_sha1, status_code=400)
 
     check_api_post_responses(api_client, url, data=invalid_swhid_type, status_code=400)
 
 
 def test_api_known_raises_large_payload_error(api_client):
     random_swhid = "swh:1:cnt:8068d0075010b590762c6cb5682ed53cb3c13deb"
     limit = 10000
     err_msg = "The maximum number of SWHIDs this endpoint can receive is 1000"
 
     swhids = [random_swhid for i in range(limit)]
 
     url = reverse("api-1-known")
     resp = check_api_post_responses(api_client, url, data=swhids, status_code=413)
 
     assert resp.data == {"exception": "LargePayloadExc", "reason": err_msg}
diff --git a/swh/web/tests/api/views/test_vault.py b/swh/web/tests/api/views/test_vault.py
index d8e6117b..5945ce80 100644
--- a/swh/web/tests/api/views/test_vault.py
+++ b/swh/web/tests/api/views/test_vault.py
@@ -1,329 +1,325 @@
 # Copyright (C) 2017-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import re
 
-from hypothesis import given
 import pytest
 
 from swh.model.swhids import CoreSWHID
 from swh.vault.exc import NotFoundExc
 from swh.web.common.utils import reverse
-from swh.web.tests.strategies import unknown_directory, unknown_revision
 from swh.web.tests.utils import (
     check_api_get_responses,
     check_api_post_responses,
     check_http_get_response,
     check_http_post_response,
 )
 
 #####################
 # Current API:
 
 
 def test_api_vault_cook(api_client, mocker, directory, revision):
     mock_archive = mocker.patch("swh.web.api.views.vault.archive")
 
     for bundle_type, swhid, content_type, in (
         ("flat", f"swh:1:dir:{directory}", "application/gzip"),
         ("gitfast", f"swh:1:rev:{revision}", "application/gzip"),
         ("git_bare", f"swh:1:rev:{revision}", "application/x-tar"),
     ):
         swhid = CoreSWHID.from_string(swhid)
 
         fetch_url = reverse(
             f"api-1-vault-fetch-{bundle_type.replace('_', '-')}",
             url_args={"swhid": str(swhid)},
         )
         stub_cook = {
             "type": bundle_type,
             "progress_msg": None,
             "task_id": 1,
             "task_status": "done",
             "swhid": swhid,
         }
         stub_fetch = b"content"
 
         mock_archive.vault_cook.return_value = stub_cook
         mock_archive.vault_fetch.return_value = stub_fetch
 
         email = "test@test.mail"
         url = reverse(
             f"api-1-vault-cook-{bundle_type.replace('_', '-')}",
             url_args={"swhid": str(swhid)},
             query_params={"email": email},
         )
 
         rv = check_api_post_responses(api_client, url, data=None, status_code=200)
         assert rv.data == {
             "fetch_url": rv.wsgi_request.build_absolute_uri(fetch_url),
             "progress_message": None,
             "id": 1,
             "status": "done",
             "swhid": str(swhid),
         }
         mock_archive.vault_cook.assert_called_with(bundle_type, swhid, email)
 
         rv = check_http_get_response(api_client, fetch_url, status_code=200)
         assert rv["Content-Type"] == content_type
         assert rv.content == stub_fetch
         mock_archive.vault_fetch.assert_called_with(bundle_type, swhid)
 
 
-@given(unknown_directory(), unknown_revision())
 def test_api_vault_cook_notfound(
     api_client, mocker, directory, revision, unknown_directory, unknown_revision
 ):
     mock_vault = mocker.patch("swh.web.common.archive.vault")
     mock_vault.cook.side_effect = NotFoundExc("object not found")
     mock_vault.fetch.side_effect = NotFoundExc("cooked archive not found")
     mock_vault.progress.side_effect = NotFoundExc("cooking request not found")
 
     for bundle_type, swhid in (
         ("flat", f"swh:1:dir:{directory}"),
         ("gitfast", f"swh:1:rev:{revision}"),
         ("git_bare", f"swh:1:rev:{revision}"),
     ):
         swhid = CoreSWHID.from_string(swhid)
 
         url = reverse(
             f"api-1-vault-cook-{bundle_type.replace('_', '-')}",
             url_args={"swhid": str(swhid)},
         )
 
         rv = check_api_get_responses(api_client, url, status_code=404)
 
         assert rv.data["exception"] == "NotFoundExc"
         assert rv.data["reason"] == f"Cooking of {swhid} was never requested."
         mock_vault.progress.assert_called_with(bundle_type, swhid)
 
     for bundle_type, swhid in (
         ("flat", f"swh:1:dir:{unknown_directory}"),
         ("gitfast", f"swh:1:rev:{unknown_revision}"),
         ("git_bare", f"swh:1:rev:{unknown_revision}"),
     ):
         swhid = CoreSWHID.from_string(swhid)
         url = reverse(
             f"api-1-vault-cook-{bundle_type.replace('_', '-')}",
             url_args={"swhid": str(swhid)},
         )
         rv = check_api_post_responses(api_client, url, data=None, status_code=404)
 
         assert rv.data["exception"] == "NotFoundExc"
         assert rv.data["reason"] == f"{swhid} not found."
         mock_vault.cook.assert_called_with(bundle_type, swhid, email=None)
 
         fetch_url = reverse(
             f"api-1-vault-fetch-{bundle_type.replace('_', '-')}",
             url_args={"swhid": str(swhid)},
         )
 
         rv = check_api_get_responses(api_client, fetch_url, status_code=404)
         assert rv.data["exception"] == "NotFoundExc"
         assert rv.data["reason"] == f"Cooked archive for {swhid} not found."
         mock_vault.fetch.assert_called_with(bundle_type, swhid)
 
 
 @pytest.mark.parametrize("bundle_type", ["flat", "gitfast", "git_bare"])
 def test_api_vault_cook_error_content(api_client, mocker, bundle_type):
     swhid = "swh:1:cnt:" + "0" * 40
 
     email = "test@test.mail"
     url = reverse(
         f"api-1-vault-cook-{bundle_type.replace('_', '-')}",
         url_args={"swhid": swhid},
         query_params={"email": email},
     )
 
     rv = check_api_post_responses(api_client, url, data=None, status_code=400)
     assert rv.data == {
         "exception": "BadInputExc",
         "reason": (
             "Content objects do not need to be cooked, "
             "use `/api/1/content/raw/` instead."
         ),
     }
 
 
 @pytest.mark.parametrize(
     "bundle_type,swhid_type,hint",
     [
         ("flat", "rev", True),
         ("flat", "rel", False),
         ("flat", "snp", False),
         ("gitfast", "dir", True),
         ("gitfast", "rel", False),
         ("gitfast", "snp", False),
         ("git_bare", "dir", True),
         ("git_bare", "rel", False),
         ("git_bare", "snp", False),
     ],
 )
 def test_api_vault_cook_error(api_client, mocker, bundle_type, swhid_type, hint):
     swhid = f"swh:1:{swhid_type}:" + "0" * 40
 
     email = "test@test.mail"
     url = reverse(
         f"api-1-vault-cook-{bundle_type.replace('_', '-')}",
         url_args={"swhid": swhid},
         query_params={"email": email},
     )
 
     rv = check_api_post_responses(api_client, url, data=None, status_code=400)
     assert rv.data["exception"] == "BadInputExc"
     if hint:
         assert re.match(
             r"Only .* can be cooked as .* bundles\. Use .*", rv.data["reason"]
         )
     else:
         assert re.match(r"Only .* can be cooked as .* bundles\.", rv.data["reason"])
 
 
 #####################
 # Legacy API:
 
 
 def test_api_vault_cook_legacy(api_client, mocker, directory, revision):
     mock_archive = mocker.patch("swh.web.api.views.vault.archive")
 
     for obj_type, bundle_type, response_obj_type, obj_id in (
         ("directory", "flat", "directory", directory),
         ("revision_gitfast", "gitfast", "revision", revision),
     ):
         swhid = CoreSWHID.from_string(f"swh:1:{obj_type[:3]}:{obj_id}")
 
         fetch_url = reverse(
             f"api-1-vault-fetch-{bundle_type}", url_args={"swhid": str(swhid)},
         )
         stub_cook = {
             "type": obj_type,
             "progress_msg": None,
             "task_id": 1,
             "task_status": "done",
             "swhid": swhid,
             "obj_type": response_obj_type,
             "obj_id": obj_id,
         }
         stub_fetch = b"content"
 
         mock_archive.vault_cook.return_value = stub_cook
         mock_archive.vault_fetch.return_value = stub_fetch
 
         email = "test@test.mail"
         url = reverse(
             f"api-1-vault-cook-{obj_type}",
             url_args={f"{obj_type[:3]}_id": obj_id},
             query_params={"email": email},
         )
 
         rv = check_api_post_responses(api_client, url, data=None, status_code=200)
         assert rv.data == {
             "fetch_url": rv.wsgi_request.build_absolute_uri(fetch_url),
             "progress_message": None,
             "id": 1,
             "status": "done",
             "swhid": str(swhid),
             "obj_type": response_obj_type,
             "obj_id": obj_id,
         }
         mock_archive.vault_cook.assert_called_with(bundle_type, swhid, email)
 
         rv = check_http_get_response(api_client, fetch_url, status_code=200)
         assert rv["Content-Type"] == "application/gzip"
         assert rv.content == stub_fetch
         mock_archive.vault_fetch.assert_called_with(bundle_type, swhid)
 
 
 def test_api_vault_cook_uppercase_hash_legacy(api_client, directory, revision):
 
     for obj_type, obj_id in (
         ("directory", directory),
         ("revision_gitfast", revision),
     ):
 
         url = reverse(
             f"api-1-vault-cook-{obj_type}-uppercase-checksum",
             url_args={f"{obj_type[:3]}_id": obj_id.upper()},
         )
         rv = check_http_post_response(
             api_client, url, data={"email": "test@test.mail"}, status_code=302
         )
 
         redirect_url = reverse(
             f"api-1-vault-cook-{obj_type}", url_args={f"{obj_type[:3]}_id": obj_id}
         )
 
         assert rv["location"] == redirect_url
 
         fetch_url = reverse(
             f"api-1-vault-fetch-{obj_type}-uppercase-checksum",
             url_args={f"{obj_type[:3]}_id": obj_id.upper()},
         )
 
         rv = check_http_get_response(api_client, fetch_url, status_code=302)
 
         redirect_url = reverse(
             f"api-1-vault-fetch-{obj_type}", url_args={f"{obj_type[:3]}_id": obj_id},
         )
 
         assert rv["location"] == redirect_url
 
 
-@given(unknown_directory(), unknown_revision())
 def test_api_vault_cook_notfound_legacy(
     api_client, mocker, directory, revision, unknown_directory, unknown_revision
 ):
     mock_vault = mocker.patch("swh.web.common.archive.vault")
     mock_vault.cook.side_effect = NotFoundExc("object not found")
     mock_vault.fetch.side_effect = NotFoundExc("cooked archive not found")
     mock_vault.progress.side_effect = NotFoundExc("cooking request not found")
 
     for obj_type, bundle_type, obj_id in (
         ("directory", "flat", directory),
         ("revision_gitfast", "gitfast", revision),
     ):
 
         url = reverse(
             f"api-1-vault-cook-{obj_type}", url_args={f"{obj_type[:3]}_id": obj_id},
         )
 
         swhid = CoreSWHID.from_string(f"swh:1:{obj_type[:3]}:{obj_id}")
 
         rv = check_api_get_responses(api_client, url, status_code=404)
 
         assert rv.data["exception"] == "NotFoundExc"
         assert rv.data["reason"] == f"Cooking of {swhid} was never requested."
         mock_vault.progress.assert_called_with(bundle_type, swhid)
 
     for obj_type, bundle_type, obj_id in (
         ("directory", "flat", unknown_directory),
         ("revision_gitfast", "gitfast", unknown_revision),
     ):
         swhid = CoreSWHID.from_string(f"swh:1:{obj_type[:3]}:{obj_id}")
 
         url = reverse(
             f"api-1-vault-cook-{obj_type}", url_args={f"{obj_type[:3]}_id": obj_id}
         )
         rv = check_api_post_responses(api_client, url, data=None, status_code=404)
 
         assert rv.data["exception"] == "NotFoundExc"
         assert rv.data["reason"] == f"{swhid} not found."
         mock_vault.cook.assert_called_with(bundle_type, swhid, email=None)
 
         fetch_url = reverse(
             f"api-1-vault-fetch-{obj_type}", url_args={f"{obj_type[:3]}_id": obj_id},
         )
 
         # Redirected to the current 'fetch' url
         rv = check_http_get_response(api_client, fetch_url, status_code=302)
         redirect_url = reverse(
             f"api-1-vault-fetch-{bundle_type}", url_args={"swhid": str(swhid)},
         )
         assert rv["location"] == redirect_url
 
         rv = check_api_get_responses(api_client, redirect_url, status_code=404)
         assert rv.data["exception"] == "NotFoundExc"
         assert rv.data["reason"] == f"Cooked archive for {swhid} not found."
         mock_vault.fetch.assert_called_with(bundle_type, swhid)
diff --git a/swh/web/tests/browse/views/test_content.py b/swh/web/tests/browse/views/test_content.py
index 87222246..60583cb5 100644
--- a/swh/web/tests/browse/views/test_content.py
+++ b/swh/web/tests/browse/views/test_content.py
@@ -1,627 +1,623 @@
 # Copyright (C) 2017-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 
-from hypothesis import given
-
 from django.utils.html import escape
 
 from swh.model.swhids import ObjectType
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.browse.utils import (
     _re_encode_content,
     get_mimetype_and_encoding_for_content,
     prepare_content_for_display,
 )
 from swh.web.common.exc import NotFoundExc
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import gen_path_info, reverse
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import invalid_sha1, unknown_content
 from swh.web.tests.utils import check_html_get_response, check_http_get_response
 
 
 def test_content_view_text(client, archive_data, content_text):
     sha1_git = content_text["sha1_git"]
 
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": content_text["path"]},
     )
 
     url_raw = reverse(
         "browse-content-raw", url_args={"query_string": content_text["sha1"]}
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     content_display = _process_content_for_display(archive_data, content_text)
     mimetype = content_display["mimetype"]
 
     if mimetype.startswith("text/"):
         assert_contains(resp, '<code class="%s">' % content_display["language"])
         assert_contains(resp, escape(content_display["content_data"]))
     assert_contains(resp, url_raw)
 
     swh_cnt_id = gen_swhid(ObjectType.CONTENT, sha1_git)
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
     assert_contains(resp, swh_cnt_id_url)
     assert_not_contains(resp, "swh-metadata-popover")
 
 
 def test_content_view_no_highlight(
     client, archive_data, content_application_no_highlight, content_text_no_highlight
 ):
     for content_ in (content_application_no_highlight, content_text_no_highlight):
         content = content_
         sha1_git = content["sha1_git"]
 
         url = reverse("browse-content", url_args={"query_string": content["sha1"]})
 
         url_raw = reverse(
             "browse-content-raw", url_args={"query_string": content["sha1"]}
         )
 
         resp = check_html_get_response(
             client, url, status_code=200, template_used="browse/content.html"
         )
 
         content_display = _process_content_for_display(archive_data, content)
 
         assert_contains(resp, '<code class="nohighlight">')
         assert_contains(resp, escape(content_display["content_data"]))
         assert_contains(resp, url_raw)
 
         swh_cnt_id = gen_swhid(ObjectType.CONTENT, sha1_git)
         swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
 
         assert_contains(resp, swh_cnt_id)
         assert_contains(resp, swh_cnt_id_url)
 
 
 def test_content_view_no_utf8_text(client, archive_data, content_text_non_utf8):
     sha1_git = content_text_non_utf8["sha1_git"]
 
     url = reverse(
         "browse-content", url_args={"query_string": content_text_non_utf8["sha1"]}
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     content_display = _process_content_for_display(archive_data, content_text_non_utf8)
 
     swh_cnt_id = gen_swhid(ObjectType.CONTENT, sha1_git)
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id_url)
     assert_contains(resp, escape(content_display["content_data"]))
 
 
 def test_content_view_image(client, archive_data, content_image_type):
     url = reverse(
         "browse-content", url_args={"query_string": content_image_type["sha1"]}
     )
 
     url_raw = reverse(
         "browse-content-raw", url_args={"query_string": content_image_type["sha1"]}
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     content_display = _process_content_for_display(archive_data, content_image_type)
     mimetype = content_display["mimetype"]
     content_data = content_display["content_data"]
     assert_contains(resp, '<img src="data:%s;base64,%s"/>' % (mimetype, content_data))
     assert_contains(resp, url_raw)
 
 
 def test_content_view_image_no_rendering(
     client, archive_data, content_unsupported_image_type_rendering
 ):
     url = reverse(
         "browse-content",
         url_args={"query_string": content_unsupported_image_type_rendering["sha1"]},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     mimetype = content_unsupported_image_type_rendering["mimetype"]
     encoding = content_unsupported_image_type_rendering["encoding"]
     assert_contains(
         resp,
         (
             f"Content with mime type {mimetype} and encoding {encoding} "
             "cannot be displayed."
         ),
     )
 
 
 def test_content_view_text_with_path(client, archive_data, content_text):
     path = content_text["path"]
 
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": path},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     assert_contains(resp, '<nav class="bread-crumbs')
 
     content_display = _process_content_for_display(archive_data, content_text)
     mimetype = content_display["mimetype"]
 
     if mimetype.startswith("text/"):
         hljs_language = content_text["hljs_language"]
         assert_contains(resp, '<code class="%s">' % hljs_language)
         assert_contains(resp, escape(content_display["content_data"]))
 
     split_path = path.split("/")
 
     root_dir_sha1 = split_path[0]
     filename = split_path[-1]
     path = path.replace(root_dir_sha1 + "/", "").replace(filename, "")
 
     swhid_context = {
         "anchor": gen_swhid(ObjectType.DIRECTORY, root_dir_sha1),
         "path": f"/{path}{filename}",
     }
 
     swh_cnt_id = gen_swhid(
         ObjectType.CONTENT, content_text["sha1_git"], metadata=swhid_context
     )
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
     assert_contains(resp, swh_cnt_id_url)
 
     path_info = gen_path_info(path)
 
     root_dir_url = reverse("browse-directory", url_args={"sha1_git": root_dir_sha1})
 
     assert_contains(resp, '<li class="swh-path">', count=len(path_info) + 1)
 
     assert_contains(
         resp, '<a href="' + root_dir_url + '">' + root_dir_sha1[:7] + "</a>"
     )
 
     for p in path_info:
         dir_url = reverse(
             "browse-directory",
             url_args={"sha1_git": root_dir_sha1},
             query_params={"path": p["path"]},
         )
         assert_contains(resp, '<a href="' + dir_url + '">' + p["name"] + "</a>")
 
     assert_contains(resp, "<li>" + filename + "</li>")
 
     url_raw = reverse(
         "browse-content-raw",
         url_args={"query_string": content_text["sha1"]},
         query_params={"filename": filename},
     )
     assert_contains(resp, url_raw)
 
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": filename},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     assert_not_contains(resp, '<nav class="bread-crumbs')
 
     invalid_path = "%s/foo/bar/baz" % root_dir_sha1
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": invalid_path},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
 
 
 def test_content_raw_text(client, archive_data, content_text):
     url = reverse("browse-content-raw", url_args={"query_string": content_text["sha1"]})
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
 
     content_data = archive_data.content_get_data(content_text["sha1"])["data"]
 
     assert resp["Content-Type"] == "text/plain"
     assert resp["Content-disposition"] == (
         "filename=%s_%s" % ("sha1", content_text["sha1"])
     )
     assert resp.content == content_data
 
     filename = content_text["path"].split("/")[-1]
 
     url = reverse(
         "browse-content-raw",
         url_args={"query_string": content_text["sha1"]},
         query_params={"filename": filename},
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
 
     assert resp["Content-Type"] == "text/plain"
     assert resp["Content-disposition"] == "filename=%s" % filename
     assert resp.content == content_data
 
 
 def test_content_raw_no_utf8_text(client, content_text_non_utf8):
     url = reverse(
         "browse-content-raw", url_args={"query_string": content_text_non_utf8["sha1"]}
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
     _, encoding = get_mimetype_and_encoding_for_content(resp.content)
     assert encoding == content_text_non_utf8["encoding"]
 
 
 def test_content_raw_bin(client, archive_data, content_image_type):
     url = reverse(
         "browse-content-raw", url_args={"query_string": content_image_type["sha1"]}
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="application/octet-stream"
     )
 
     filename = content_image_type["path"].split("/")[-1]
     content_data = archive_data.content_get_data(content_image_type["sha1"])["data"]
 
     assert resp["Content-Type"] == "application/octet-stream"
     assert resp["Content-disposition"] == "attachment; filename=%s_%s" % (
         "sha1",
         content_image_type["sha1"],
     )
     assert resp.content == content_data
 
     url = reverse(
         "browse-content-raw",
         url_args={"query_string": content_image_type["sha1"]},
         query_params={"filename": filename},
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="application/octet-stream"
     )
 
     assert resp["Content-Type"] == "application/octet-stream"
     assert resp["Content-disposition"] == "attachment; filename=%s" % filename
     assert resp.content == content_data
 
 
-@given(invalid_sha1(), unknown_content())
 def test_content_request_errors(client, invalid_sha1, unknown_content):
     url = reverse("browse-content", url_args={"query_string": invalid_sha1})
     check_html_get_response(client, url, status_code=400, template_used="error.html")
 
     url = reverse("browse-content", url_args={"query_string": unknown_content["sha1"]})
     check_html_get_response(
         client, url, status_code=404, template_used="browse/content.html"
     )
 
 
 def test_content_bytes_missing(client, archive_data, mocker, content):
     mock_archive = mocker.patch("swh.web.browse.utils.archive")
     content_data = archive_data.content_get(content["sha1"])
 
     mock_archive.lookup_content.return_value = content_data
     mock_archive.lookup_content_filetype.side_effect = Exception()
     mock_archive.lookup_content_raw.side_effect = NotFoundExc(
         "Content bytes not available!"
     )
 
     url = reverse("browse-content", url_args={"query_string": content["sha1"]})
 
     check_html_get_response(
         client, url, status_code=404, template_used="browse/content.html"
     )
 
 
 def test_content_too_large(client, mocker):
     mock_request_content = mocker.patch("swh.web.browse.views.content.request_content")
     stub_content_too_large_data = {
         "checksums": {
             "sha1": "8624bcdae55baeef00cd11d5dfcfa60f68710a02",
             "sha1_git": "94a9ed024d3859793618152ea559a168bbcbb5e2",
             "sha256": (
                 "8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b16" "5a1dcd80c7c545eb65b903"
             ),
             "blake2s256": (
                 "38702b7168c7785bfe748b51b45d9856070ba90" "f9dc6d90f2ea75d4356411ffe"
             ),
         },
         "length": 30000000,
         "raw_data": None,
         "mimetype": "text/plain",
         "encoding": "us-ascii",
         "language": "not detected",
         "licenses": "GPL",
         "error_code": 200,
         "error_message": "",
         "error_description": "",
     }
 
     content_sha1 = stub_content_too_large_data["checksums"]["sha1"]
 
     mock_request_content.return_value = stub_content_too_large_data
 
     url = reverse("browse-content", url_args={"query_string": content_sha1})
 
     url_raw = reverse("browse-content-raw", url_args={"query_string": content_sha1})
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     assert_contains(resp, "Content is too large to be displayed")
     assert_contains(resp, url_raw)
 
 
 def test_content_uppercase(client, content):
     url = reverse(
         "browse-content-uppercase-checksum",
         url_args={"query_string": content["sha1"].upper()},
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-content", url_args={"query_string": content["sha1"]})
 
     assert resp["location"] == redirect_url
 
 
 def test_content_utf8_detected_as_binary_display(
     client, archive_data, content_utf8_detected_as_binary
 ):
     url = reverse(
         "browse-content",
         url_args={"query_string": content_utf8_detected_as_binary["sha1"]},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     content_display = _process_content_for_display(
         archive_data, content_utf8_detected_as_binary
     )
 
     assert_contains(resp, escape(content_display["content_data"]))
 
 
 def test_content_origin_snapshot_branch_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     branch_info = random.choice(branches)
 
     directory = archive_data.revision_get(branch_info["revision"])["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_file = random.choice(
         [e for e in directory_content if e["type"] == "file"]
     )
 
     url = reverse(
         "browse-content",
         url_args={"query_string": directory_file["checksums"]["sha1"]},
         query_params={
             "origin_url": origin_with_multiple_visits["url"],
             "snapshot": snapshot["id"],
             "branch": branch_info["name"],
             "path": directory_file["name"],
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_file["name"])
     assert_contains(resp, f"Branch: <strong>{branch_info['name']}</strong>")
 
     cnt_swhid = gen_swhid(
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
             "path": f"/{directory_file['name']}",
         },
     )
     assert_contains(resp, cnt_swhid)
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         directory,
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         branch_info["revision"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
 
 def test_content_origin_snapshot_release_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     release_info = random.choice(releases)
 
     directory_content = archive_data.directory_ls(release_info["directory"])
     directory_file = random.choice(
         [e for e in directory_content if e["type"] == "file"]
     )
 
     url = reverse(
         "browse-content",
         url_args={"query_string": directory_file["checksums"]["sha1"]},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "release": release_info["name"],
             "path": directory_file["name"],
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_file["name"])
     assert_contains(resp, f"Release: <strong>{release_info['name']}</strong>")
 
     cnt_swhid = gen_swhid(
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
             "path": f"/{directory_file['name']}",
         },
     )
     assert_contains(resp, cnt_swhid)
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         release_info["directory"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         release_info["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     rel_swhid = gen_swhid(
         ObjectType.RELEASE,
         release_info["id"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rel_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
 
 def _check_origin_snapshot_related_html(
     resp, origin, snapshot, snapshot_sizes, branches, releases
 ):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin["url"]}
     )
     assert_contains(resp, f'href="{browse_origin_url}"')
 
     origin_branches_url = reverse(
         "browse-origin-branches",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse(
         "browse-origin-releases",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_releases_url)}"')
     assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<li class="swh-branch">', count=len(branches))
     assert_contains(resp, '<li class="swh-release">', count=len(releases))
 
 
 def _process_content_for_display(archive_data, content):
     content_data = archive_data.content_get_data(content["sha1"])
 
     mime_type, encoding = get_mimetype_and_encoding_for_content(content_data["data"])
 
     mime_type, encoding, content_data = _re_encode_content(
         mime_type, encoding, content_data["data"]
     )
 
     content_display = prepare_content_for_display(
         content_data, mime_type, content["path"]
     )
 
     assert type(content_display["content_data"]) == str
 
     return content_display
diff --git a/swh/web/tests/browse/views/test_directory.py b/swh/web/tests/browse/views/test_directory.py
index 15685a91..23065065 100644
--- a/swh/web/tests/browse/views/test_directory.py
+++ b/swh/web/tests/browse/views/test_directory.py
@@ -1,501 +1,495 @@
 # Copyright (C) 2017-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 
 from hypothesis import given
 
 from django.utils.html import escape
 
 from swh.model.from_disk import DentryPerms
 from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.model import (
     Directory,
     DirectoryEntry,
     Origin,
     OriginVisit,
     OriginVisitStatus,
     Revision,
     RevisionType,
     Snapshot,
     SnapshotBranch,
     TargetType,
     TimestampWithTimezone,
 )
 from swh.model.swhids import ObjectType
 from swh.storage.utils import now
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import gen_path_info, reverse
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import (
-    invalid_sha1,
-    new_person,
-    new_swh_date,
-    unknown_directory,
-)
+from swh.web.tests.strategies import new_person, new_swh_date
 from swh.web.tests.utils import check_html_get_response
 
 
 def test_root_directory_view(client, archive_data, directory):
     _directory_view_checks(client, directory, archive_data.directory_ls(directory))
 
 
 def test_sub_directory_view(client, archive_data, directory_with_subdirs):
     dir_content = archive_data.directory_ls(directory_with_subdirs)
     subdir = random.choice([e for e in dir_content if e["type"] == "dir"])
     subdir_content = archive_data.directory_ls(subdir["target"])
     _directory_view_checks(
         client, directory_with_subdirs, subdir_content, subdir["name"]
     )
 
 
 @given(new_person(), new_swh_date())
 def test_sub_directory_view_origin_context(
     client, archive_data, empty_directory, person, date
 ):
     origin_url = "test_sub_directory_view_origin_context"
     subdir = Directory(
         entries=(
             DirectoryEntry(
                 name=b"foo",
                 type="dir",
                 target=hash_to_bytes(empty_directory),
                 perms=DentryPerms.directory,
             ),
             DirectoryEntry(
                 name=b"bar",
                 type="dir",
                 target=hash_to_bytes(empty_directory),
                 perms=DentryPerms.directory,
             ),
         )
     )
 
     parentdir = Directory(
         entries=(
             DirectoryEntry(
                 name=b"baz", type="dir", target=subdir.id, perms=DentryPerms.directory,
             ),
         )
     )
     archive_data.directory_add([subdir, parentdir])
 
     revision = Revision(
         directory=parentdir.id,
         author=person,
         committer=person,
         message=b"commit message",
         date=TimestampWithTimezone.from_datetime(date),
         committer_date=TimestampWithTimezone.from_datetime(date),
         synthetic=False,
         type=RevisionType.GIT,
     )
     archive_data.revision_add([revision])
 
     snapshot = Snapshot(
         branches={
             b"HEAD": SnapshotBranch(
                 target="refs/head/master".encode(), target_type=TargetType.ALIAS,
             ),
             b"refs/head/master": SnapshotBranch(
                 target=revision.id, target_type=TargetType.REVISION,
             ),
         }
     )
     archive_data.snapshot_add([snapshot])
 
     archive_data.origin_add([Origin(url=origin_url)])
     date = now()
     visit = OriginVisit(origin=origin_url, date=date, type="git")
     visit = archive_data.origin_visit_add([visit])[0]
     visit_status = OriginVisitStatus(
         origin=origin_url,
         visit=visit.visit,
         date=date,
         status="full",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
     dir_content = archive_data.directory_ls(hash_to_hex(parentdir.id))
     subdir = dir_content[0]
     subdir_content = archive_data.directory_ls(subdir["target"])
     _directory_view_checks(
         client,
         hash_to_hex(parentdir.id),
         subdir_content,
         subdir["name"],
         origin_url,
         hash_to_hex(snapshot.id),
         hash_to_hex(revision.id),
     )
 
 
-@given(invalid_sha1(), unknown_directory())
 def test_directory_request_errors(client, invalid_sha1, unknown_directory):
     dir_url = reverse("browse-directory", url_args={"sha1_git": invalid_sha1})
 
     check_html_get_response(
         client, dir_url, status_code=400, template_used="error.html"
     )
 
     dir_url = reverse("browse-directory", url_args={"sha1_git": unknown_directory})
 
     check_html_get_response(
         client, dir_url, status_code=404, template_used="error.html"
     )
 
 
 def test_directory_with_invalid_path(client, directory):
     path = "foo/bar"
     dir_url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={"path": path},
     )
 
     resp = check_html_get_response(
         client, dir_url, status_code=404, template_used="browse/directory.html"
     )
     error_message = (
         f"Directory entry with path {path} from root directory {directory} not found"
     )
     assert_contains(resp, error_message, status_code=404)
 
 
 def test_directory_uppercase(client, directory):
     url = reverse(
         "browse-directory-uppercase-checksum", url_args={"sha1_git": directory.upper()}
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-directory", url_args={"sha1_git": directory})
 
     assert resp["location"] == redirect_url
 
 
 def test_permalink_box_context(client, tests_data, directory):
     origin_url = random.choice(tests_data["origins"])["url"]
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={"origin_url": origin_url},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     assert_contains(resp, 'id="swhid-context-option-directory"')
 
 
 def test_directory_origin_snapshot_branch_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     branch_info = random.choice(branches)
 
     directory = archive_data.revision_get(branch_info["revision"])["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_subdir = random.choice(
         [e for e in directory_content if e["type"] == "dir"]
     )
 
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "branch": branch_info["name"],
             "path": directory_subdir["name"],
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_subdir["name"])
     assert_contains(resp, f"Branch: <strong>{branch_info['name']}</strong>")
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         directory_subdir["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
             "path": "/",
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         branch_info["revision"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
 
 def test_drectory_origin_snapshot_release_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     release_info = random.choice(releases)
 
     directory = release_info["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_subdir = random.choice(
         [e for e in directory_content if e["type"] == "dir"]
     )
 
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "release": release_info["name"],
             "path": directory_subdir["name"],
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_subdir["name"])
     assert_contains(resp, f"Release: <strong>{release_info['name']}</strong>")
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         directory_subdir["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
             "path": "/",
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         release_info["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     rel_swhid = gen_swhid(
         ObjectType.RELEASE,
         release_info["id"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rel_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
 
 def test_directory_origin_snapshot_revision_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     branch_info = random.choice(branches)
 
     directory = archive_data.revision_get(branch_info["revision"])["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_subdir = random.choice(
         [e for e in directory_content if e["type"] == "dir"]
     )
 
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "revision": branch_info["revision"],
             "path": directory_subdir["name"],
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
 
     assert_contains(resp, f"Revision: <strong>{branch_info['revision']}</strong>")
 
 
 def _check_origin_snapshot_related_html(
     resp, origin, snapshot, snapshot_sizes, branches, releases
 ):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin["url"]}
     )
 
     assert_contains(resp, f'href="{browse_origin_url}"')
 
     origin_branches_url = reverse(
         "browse-origin-branches",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse(
         "browse-origin-releases",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_releases_url)}"')
     assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<li class="swh-branch">', count=len(branches))
     assert_contains(resp, '<li class="swh-release">', count=len(releases))
 
 
 def _directory_view_checks(
     client,
     root_directory_sha1,
     directory_entries,
     path=None,
     origin_url=None,
     snapshot_id=None,
     revision_id=None,
 ):
     dirs = [e for e in directory_entries if e["type"] in ("dir", "rev")]
     files = [e for e in directory_entries if e["type"] == "file"]
 
     url_args = {"sha1_git": root_directory_sha1}
     query_params = {"origin_url": origin_url, "snapshot": snapshot_id}
 
     url = reverse(
         "browse-directory",
         url_args=url_args,
         query_params={**query_params, "path": path},
     )
 
     root_dir_url = reverse(
         "browse-directory", url_args=url_args, query_params=query_params,
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
 
     assert_contains(
         resp, '<a href="' + root_dir_url + '">' + root_directory_sha1[:7] + "</a>",
     )
     assert_contains(resp, '<td class="swh-directory">', count=len(dirs))
     assert_contains(resp, '<td class="swh-content">', count=len(files))
 
     for d in dirs:
         if d["type"] == "rev":
             dir_url = reverse("browse-revision", url_args={"sha1_git": d["target"]})
         else:
             dir_path = d["name"]
             if path:
                 dir_path = "%s/%s" % (path, d["name"])
             dir_url = reverse(
                 "browse-directory",
                 url_args={"sha1_git": root_directory_sha1},
                 query_params={**query_params, "path": dir_path},
             )
         assert_contains(resp, dir_url)
 
     for f in files:
         file_path = "%s/%s" % (root_directory_sha1, f["name"])
         if path:
             file_path = "%s/%s/%s" % (root_directory_sha1, path, f["name"])
         query_string = "sha1_git:" + f["target"]
         file_url = reverse(
             "browse-content",
             url_args={"query_string": query_string},
             query_params={**query_params, "path": file_path},
         )
         assert_contains(resp, file_url)
 
     path_info = gen_path_info(path)
 
     assert_contains(resp, '<li class="swh-path">', count=len(path_info) + 1)
     assert_contains(
         resp, '<a href="%s">%s</a>' % (root_dir_url, root_directory_sha1[:7])
     )
 
     for p in path_info:
         dir_url = reverse(
             "browse-directory",
             url_args={"sha1_git": root_directory_sha1},
             query_params={**query_params, "path": p["path"]},
         )
         assert_contains(resp, '<a href="%s">%s</a>' % (dir_url, p["name"]))
 
     assert_contains(resp, "vault-cook-directory")
 
     swh_dir_id = gen_swhid(ObjectType.DIRECTORY, directory_entries[0]["dir_id"])
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
 
     swhid_context = {}
     if origin_url:
         swhid_context["origin"] = origin_url
     if snapshot_id:
         swhid_context["visit"] = gen_swhid(ObjectType.SNAPSHOT, snapshot_id)
     if root_directory_sha1 != directory_entries[0]["dir_id"]:
         swhid_context["anchor"] = gen_swhid(ObjectType.DIRECTORY, root_directory_sha1)
     if root_directory_sha1 != directory_entries[0]["dir_id"]:
         swhid_context["anchor"] = gen_swhid(ObjectType.DIRECTORY, root_directory_sha1)
     if revision_id:
         swhid_context["anchor"] = gen_swhid(ObjectType.REVISION, revision_id)
     swhid_context["path"] = f"/{path}/" if path else None
 
     swh_dir_id = gen_swhid(
         ObjectType.DIRECTORY, directory_entries[0]["dir_id"], metadata=swhid_context
     )
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
     assert_not_contains(resp, "swh-metadata-popover")
diff --git a/swh/web/tests/browse/views/test_origin.py b/swh/web/tests/browse/views/test_origin.py
index 622fc627..335c7b5e 100644
--- a/swh/web/tests/browse/views/test_origin.py
+++ b/swh/web/tests/browse/views/test_origin.py
@@ -1,1322 +1,1317 @@
 # Copyright (C) 2017-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 import re
 import string
 
 from hypothesis import given
 import pytest
 
 from django.utils.html import escape
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.model import (
     OriginVisit,
     OriginVisitStatus,
     Snapshot,
     SnapshotBranch,
     TargetType,
 )
 from swh.model.swhids import ObjectType
 from swh.storage.utils import now
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.common.exc import NotFoundExc
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import (
     format_utc_iso_date,
     gen_path_info,
     parse_iso8601_date_to_utc,
     reverse,
 )
 from swh.web.tests.data import get_content, random_sha1
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import (
-    new_origin,
-    new_snapshot,
-    unknown_revision,
-    visit_dates,
-)
+from swh.web.tests.strategies import new_origin, new_snapshot, visit_dates
 from swh.web.tests.utils import check_html_get_response
 
 
 def test_origin_visits_browse(client, archive_data, origin_with_multiple_visits):
     origin_url = origin_with_multiple_visits["url"]
     url = reverse("browse-origin-visits", query_params={"origin_url": origin_url})
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/origin-visits.html"
     )
 
     visits = archive_data.origin_visit_get(origin_url)
 
     for v in visits:
         vdate = format_utc_iso_date(v["date"], "%Y-%m-%dT%H:%M:%SZ")
         browse_dir_url = reverse(
             "browse-origin-directory",
             query_params={"origin_url": origin_url, "timestamp": vdate},
         )
         assert_contains(resp, browse_dir_url)
 
     _check_origin_link(resp, origin_url)
 
 
 def test_origin_content_view(
     client, archive_data, swh_scheduler, origin_with_multiple_visits
 ):
     origin_visits = archive_data.origin_visit_get(origin_with_multiple_visits["url"])
 
     def _get_archive_data(visit_idx):
         snapshot = archive_data.snapshot_get(origin_visits[visit_idx]["snapshot"])
         head_rev_id = archive_data.snapshot_get_head(snapshot)
         head_rev = archive_data.revision_get(head_rev_id)
         dir_content = archive_data.directory_ls(head_rev["directory"])
         dir_files = [e for e in dir_content if e["type"] == "file"]
         dir_file = random.choice(dir_files)
         branches, releases, _ = process_snapshot_branches(snapshot)
         return {
             "branches": branches,
             "releases": releases,
             "root_dir_sha1": head_rev["directory"],
             "content": get_content(dir_file["checksums"]["sha1"]),
             "visit": origin_visits[visit_idx],
             "snapshot_sizes": archive_data.snapshot_count_branches(snapshot["id"]),
         }
 
     tdata = _get_archive_data(-1)
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
     )
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         timestamp=tdata["visit"]["date"],
     )
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         snapshot_id=tdata["visit"]["snapshot"],
     )
 
     tdata = _get_archive_data(0)
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[0],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         visit_id=tdata["visit"]["visit"],
     )
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[0],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         snapshot_id=tdata["visit"]["snapshot"],
     )
 
 
 def test_origin_root_directory_view(client, archive_data, swh_scheduler, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
     visit = origin_visits[-1]
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
     head_rev = archive_data.revision_get(head_rev_id)
     root_dir_sha1 = head_rev["directory"]
     dir_content = archive_data.directory_ls(root_dir_sha1)
     branches, releases, _ = process_snapshot_branches(snapshot)
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
         snapshot_id=visit["snapshot"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         dir_content,
         snapshot_id=visit["snapshot"],
     )
 
 
 def test_origin_sub_directory_view(client, archive_data, swh_scheduler, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
     visit = origin_visits[-1]
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
     head_rev = archive_data.revision_get(head_rev_id)
     root_dir_sha1 = head_rev["directory"]
     subdirs = [
         e for e in archive_data.directory_ls(root_dir_sha1) if e["type"] == "dir"
     ]
     branches, releases, _ = process_snapshot_branches(snapshot)
 
     if len(subdirs) == 0:
         return
 
     subdir = random.choice(subdirs)
     subdir_content = archive_data.directory_ls(subdir["target"])
     subdir_path = subdir["name"]
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
         snapshot_id=visit["snapshot"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir_content,
         path=subdir_path,
         snapshot_id=visit["snapshot"],
     )
 
 
 def test_origin_branches(client, archive_data, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
     visit = origin_visits[-1]
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     snapshot_content = process_snapshot_branches(snapshot)
 
     _origin_branches_test_helper(client, origin, snapshot_content, snapshot_sizes)
 
     _origin_branches_test_helper(
         client, origin, snapshot_content, snapshot_sizes, snapshot_id=visit["snapshot"]
     )
 
 
 def test_origin_releases(client, archive_data, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
     visit = origin_visits[-1]
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     snapshot_content = process_snapshot_branches(snapshot)
 
     _origin_releases_test_helper(client, origin, snapshot_content, snapshot_sizes)
 
     _origin_releases_test_helper(
         client, origin, snapshot_content, snapshot_sizes, snapshot_id=visit["snapshot"]
     )
 
 
 @given(
     new_origin(), new_snapshot(min_size=4, max_size=4), visit_dates(),
 )
 def test_origin_snapshot_null_branch(
     client, archive_data, revisions_list, new_origin, new_snapshot, visit_dates,
 ):
     revisions = revisions_list(size=4)
     snp_dict = new_snapshot.to_dict()
     archive_data.origin_add([new_origin])
     for i, branch in enumerate(snp_dict["branches"].keys()):
         if i == 0:
             snp_dict["branches"][branch] = None
         else:
             snp_dict["branches"][branch] = {
                 "target_type": "revision",
                 "target": hash_to_bytes(revisions[i - 1]),
             }
 
     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
     visit = archive_data.origin_visit_add(
         [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="partial",
         snapshot=snp_dict["id"],
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory", query_params={"origin_url": new_origin.url}
     )
 
     check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
 
 
 @given(
     new_origin(), new_snapshot(min_size=4, max_size=4), visit_dates(),
 )
 def test_origin_snapshot_invalid_branch(
     client, archive_data, revisions_list, new_origin, new_snapshot, visit_dates,
 ):
     revisions = revisions_list(size=4)
     snp_dict = new_snapshot.to_dict()
     archive_data.origin_add([new_origin])
     for i, branch in enumerate(snp_dict["branches"].keys()):
         snp_dict["branches"][branch] = {
             "target_type": "revision",
             "target": hash_to_bytes(revisions[i]),
         }
 
     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
     visit = archive_data.origin_visit_add(
         [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="full",
         snapshot=snp_dict["id"],
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": new_origin.url, "branch": "invalid_branch"},
     )
 
     check_html_get_response(client, url, status_code=404, template_used="error.html")
 
 
 @given(new_origin())
 def test_browse_visits_origin_not_found(client, new_origin):
     url = reverse("browse-origin-visits", query_params={"origin_url": new_origin.url})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(
         resp, f"Origin with url {new_origin.url} not found", status_code=404
     )
 
 
 def test_browse_origin_directory_no_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
     )
     mock_get_origin_visits.return_value = []
     mock_archive = mocker.patch("swh.web.common.origin_visits.archive")
     mock_archive.lookup_origin_visit_latest.return_value = None
     url = reverse("browse-origin-directory", query_params={"origin_url": origin["url"]})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(resp, "No valid visit", status_code=404)
     assert not mock_get_origin_visits.called
 
 
 def test_browse_origin_directory_unknown_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
     )
     mock_get_origin_visits.return_value = [{"visit": 1}]
 
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin["url"], "visit_id": 2},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search("Visit.*not found", resp.content.decode("utf-8"))
     assert mock_get_origin_visits.called
 
 
 def test_browse_origin_directory_not_found(client, origin):
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin["url"], "path": "/invalid/dir/path/"},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="browse/directory.html"
     )
     assert re.search("Directory.*not found", resp.content.decode("utf-8"))
 
 
 def test_browse_origin_content_no_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
     )
     mock_get_origin_visits.return_value = []
     mock_archive = mocker.patch("swh.web.common.origin_visits.archive")
     mock_archive.lookup_origin_visit_latest.return_value = None
     url = reverse(
         "browse-origin-content",
         query_params={"origin_url": origin["url"], "path": "foo"},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(resp, "No valid visit", status_code=404)
     assert not mock_get_origin_visits.called
 
 
 def test_browse_origin_content_unknown_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
     )
     mock_get_origin_visits.return_value = [{"visit": 1}]
 
     url = reverse(
         "browse-origin-content",
         query_params={"origin_url": origin["url"], "path": "foo", "visit_id": 2},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search("Visit.*not found", resp.content.decode("utf-8"))
     assert mock_get_origin_visits.called
 
 
 def _add_empty_snapshot_origin(new_origin, archive_data):
     snapshot = Snapshot(branches={})
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([snapshot])
     visit = archive_data.origin_visit_add(
         [OriginVisit(origin=new_origin.url, date=now(), type="git",)]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="full",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize("object_type", ["content", "directory"])
 @given(new_origin())
 def test_browse_origin_content_directory_empty_snapshot(
     client, staff_user, archive_data, object_type, new_origin
 ):
 
     _add_empty_snapshot_origin(new_origin, archive_data)
 
     # to check proper generation of raw extrinsic metadata api links
     client.force_login(staff_user)
 
     url = reverse(
         f"browse-origin-{object_type}",
         query_params={"origin_url": new_origin.url, "path": "baz"},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used=f"browse/{object_type}.html"
     )
     assert re.search("snapshot.*is empty", resp.content.decode("utf-8"))
 
 
 def test_browse_origin_content_not_found(client, origin):
     url = reverse(
         "browse-origin-content",
         query_params={"origin_url": origin["url"], "path": "/invalid/file/path"},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="browse/content.html"
     )
     assert re.search("Directory entry.*not found", resp.content.decode("utf-8"))
 
 
 def test_browse_directory_snapshot_not_found(client, mocker, origin):
     mock_get_snapshot_context = mocker.patch(
         "swh.web.browse.snapshot_context.get_snapshot_context"
     )
     mock_get_snapshot_context.side_effect = NotFoundExc("Snapshot not found")
     url = reverse("browse-origin-directory", query_params={"origin_url": origin["url"]})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(resp, "Snapshot not found", status_code=404)
     assert mock_get_snapshot_context.called
 
 
 @given(new_origin())
 def test_origin_empty_snapshot(client, archive_data, new_origin):
 
     _add_empty_snapshot_origin(new_origin, archive_data)
 
     url = reverse(
         "browse-origin-directory", query_params={"origin_url": new_origin.url}
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     resp_content = resp.content.decode("utf-8")
     assert re.search("snapshot.*is empty", resp_content)
     assert not re.search("swh-tr-link", resp_content)
 
 
 @given(new_origin())
 def test_origin_empty_snapshot_null_revision(client, archive_data, new_origin):
     snapshot = Snapshot(
         branches={
             b"HEAD": SnapshotBranch(
                 target="refs/head/master".encode(), target_type=TargetType.ALIAS,
             ),
             b"refs/head/master": None,
         }
     )
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([snapshot])
     visit = archive_data.origin_visit_add(
         [OriginVisit(origin=new_origin.url, date=now(), type="git",)]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="partial",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory", query_params={"origin_url": new_origin.url},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     resp_content = resp.content.decode("utf-8")
     assert re.search("snapshot.*is empty", resp_content)
     assert not re.search("swh-tr-link", resp_content)
 
 
 def test_origin_release_browse(client, archive_data, origin_with_releases):
     origin_url = origin_with_releases["url"]
     snapshot = archive_data.snapshot_get_latest(origin_url)
     release = [
         b for b in snapshot["branches"].values() if b["target_type"] == "release"
     ][-1]
     release_data = archive_data.release_get(release["target"])
     revision_data = archive_data.revision_get(release_data["target"])
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin_url, "release": release_data["name"]},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     assert_contains(resp, release_data["name"])
     assert_contains(resp, release["target"])
 
     swhid_context = {
         "origin": origin_url,
         "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         "anchor": gen_swhid(ObjectType.RELEASE, release_data["id"]),
     }
 
     swh_dir_id = gen_swhid(
         ObjectType.DIRECTORY, revision_data["directory"], metadata=swhid_context
     )
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
 
 def test_origin_release_browse_not_found(client, origin_with_releases):
 
     invalid_release_name = "swh-foo-bar"
     url = reverse(
         "browse-origin-directory",
         query_params={
             "origin_url": origin_with_releases["url"],
             "release": invalid_release_name,
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search(
         f"Release {invalid_release_name}.*not found", resp.content.decode("utf-8")
     )
 
 
-@given(new_origin(), unknown_revision())
+@given(new_origin())
 def test_origin_browse_directory_branch_with_non_resolvable_revision(
-    client, archive_data, new_origin, unknown_revision
+    client, archive_data, unknown_revision, new_origin,
 ):
     branch_name = "master"
     snapshot = Snapshot(
         branches={
             branch_name.encode(): SnapshotBranch(
                 target=hash_to_bytes(unknown_revision), target_type=TargetType.REVISION,
             )
         }
     )
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([snapshot])
     visit = archive_data.origin_visit_add(
         [OriginVisit(origin=new_origin.url, date=now(), type="git",)]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="partial",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": new_origin.url, "branch": branch_name},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     assert_contains(
         resp, f"Revision {unknown_revision } could not be found in the archive."
     )
 
     # no revision card
     assert_not_contains(resp, "swh-tip-revision")
     # no Download dropdown
     assert_not_contains(resp, "swh-vault-download")
     # no History link
     assert_not_contains(resp, "swh-tr-link")
     # no SWHIDs for directory and revision
     assert_not_contains(resp, "swh:1:dir:")
     assert_not_contains(resp, "swh:1:rev:")
 
 
 def test_origin_content_no_path(client, origin):
     url = reverse("browse-origin-content", query_params={"origin_url": origin["url"]})
 
     resp = check_html_get_response(
         client, url, status_code=400, template_used="error.html"
     )
     assert_contains(
         resp, "The path of a content must be given as query parameter.", status_code=400
     )
 
 
 def test_origin_views_no_url_query_parameter(client):
     for browse_context in (
         "content",
         "directory",
         "log",
         "branches",
         "releases",
         "visits",
     ):
         url = reverse(f"browse-origin-{browse_context}")
 
         resp = check_html_get_response(
             client, url, status_code=400, template_used="error.html"
         )
         assert_contains(
             resp, "An origin URL must be provided as query parameter.", status_code=400
         )
 
 
 def _origin_content_view_test_helper(
     client,
     archive_data,
     origin_info,
     origin_visit,
     snapshot_sizes,
     origin_branches,
     origin_releases,
     root_dir_sha1,
     content,
     visit_id=None,
     timestamp=None,
     snapshot_id=None,
 ):
     content_path = "/".join(content["path"].split("/")[1:])
 
     if not visit_id and not snapshot_id:
         visit_id = origin_visit["visit"]
 
     query_params = {"origin_url": origin_info["url"], "path": content_path}
 
     if timestamp:
         query_params["timestamp"] = timestamp
 
     if visit_id:
         query_params["visit_id"] = visit_id
     elif snapshot_id:
         query_params["snapshot"] = snapshot_id
 
     url = reverse("browse-origin-content", query_params=query_params)
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     assert type(content["data"]) == str
 
     assert_contains(resp, '<code class="%s">' % content["hljs_language"])
     assert_contains(resp, escape(content["data"]))
 
     split_path = content_path.split("/")
 
     filename = split_path[-1]
     path = content_path.replace(filename, "")[:-1]
 
     path_info = gen_path_info(path)
 
     del query_params["path"]
 
     if timestamp:
         query_params["timestamp"] = format_utc_iso_date(
             parse_iso8601_date_to_utc(timestamp).isoformat(), "%Y-%m-%dT%H:%M:%SZ"
         )
 
     root_dir_url = reverse("browse-origin-directory", query_params=query_params)
 
     assert_contains(resp, '<li class="swh-path">', count=len(path_info) + 1)
 
     assert_contains(resp, '<a href="%s">%s</a>' % (root_dir_url, root_dir_sha1[:7]))
 
     for p in path_info:
         query_params["path"] = p["path"]
         dir_url = reverse("browse-origin-directory", query_params=query_params)
         assert_contains(resp, '<a href="%s">%s</a>' % (dir_url, p["name"]))
 
     assert_contains(resp, "<li>%s</li>" % filename)
 
     query_string = "sha1_git:" + content["sha1_git"]
 
     url_raw = reverse(
         "browse-content-raw",
         url_args={"query_string": query_string},
         query_params={"filename": filename},
     )
     assert_contains(resp, url_raw)
 
     if "path" in query_params:
         del query_params["path"]
 
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_releases_url)}">')
     assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<li class="swh-branch">', count=len(origin_branches))
 
     query_params["path"] = content_path
 
     for branch in origin_branches:
         root_dir_branch_url = reverse(
             "browse-origin-content",
             query_params={"branch": branch["name"], **query_params},
         )
 
         assert_contains(resp, '<a href="%s">' % root_dir_branch_url)
 
     assert_contains(resp, '<li class="swh-release">', count=len(origin_releases))
 
     query_params["branch"] = None
     for release in origin_releases:
         root_dir_release_url = reverse(
             "browse-origin-content",
             query_params={"release": release["name"], **query_params},
         )
 
         assert_contains(resp, '<a href="%s">' % root_dir_release_url)
 
     url = reverse("browse-origin-content", query_params=query_params)
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
     snapshot = archive_data.snapshot_get(origin_visit["snapshot"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
 
     swhid_context = {
         "origin": origin_info["url"],
         "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         "anchor": gen_swhid(ObjectType.REVISION, head_rev_id),
         "path": f"/{content_path}",
     }
 
     swh_cnt_id = gen_swhid(
         ObjectType.CONTENT, content["sha1_git"], metadata=swhid_context
     )
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
     assert_contains(resp, swh_cnt_id_url)
 
     assert_contains(resp, "swh-take-new-snapshot")
 
     _check_origin_link(resp, origin_info["url"])
 
     assert_not_contains(resp, "swh-metadata-popover")
 
 
 def _origin_directory_view_test_helper(
     client,
     archive_data,
     origin_info,
     origin_visit,
     snapshot_sizes,
     origin_branches,
     origin_releases,
     root_directory_sha1,
     directory_entries,
     visit_id=None,
     timestamp=None,
     snapshot_id=None,
     path=None,
 ):
     dirs = [e for e in directory_entries if e["type"] in ("dir", "rev")]
     files = [e for e in directory_entries if e["type"] == "file"]
 
     if not visit_id and not snapshot_id:
         visit_id = origin_visit["visit"]
 
     query_params = {"origin_url": origin_info["url"]}
 
     if timestamp:
         query_params["timestamp"] = timestamp
     elif visit_id:
         query_params["visit_id"] = visit_id
     else:
         query_params["snapshot"] = snapshot_id
 
     if path:
         query_params["path"] = path
 
     url = reverse("browse-origin-directory", query_params=query_params)
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     assert_contains(resp, '<td class="swh-directory">', count=len(dirs))
     assert_contains(resp, '<td class="swh-content">', count=len(files))
 
     if timestamp:
         query_params["timestamp"] = format_utc_iso_date(
             parse_iso8601_date_to_utc(timestamp).isoformat(), "%Y-%m-%dT%H:%M:%SZ"
         )
 
     for d in dirs:
         if d["type"] == "rev":
             dir_url = reverse("browse-revision", url_args={"sha1_git": d["target"]})
         else:
             dir_path = d["name"]
             if path:
                 dir_path = "%s/%s" % (path, d["name"])
             query_params["path"] = dir_path
             dir_url = reverse("browse-origin-directory", query_params=query_params,)
         assert_contains(resp, dir_url)
 
     for f in files:
         file_path = f["name"]
         if path:
             file_path = "%s/%s" % (path, f["name"])
         query_params["path"] = file_path
         file_url = reverse("browse-origin-content", query_params=query_params)
         assert_contains(resp, file_url)
 
     if "path" in query_params:
         del query_params["path"]
 
     root_dir_branch_url = reverse("browse-origin-directory", query_params=query_params)
 
     nb_bc_paths = 1
     if path:
         nb_bc_paths = len(path.split("/")) + 1
 
     assert_contains(resp, '<li class="swh-path">', count=nb_bc_paths)
     assert_contains(
         resp, '<a href="%s">%s</a>' % (root_dir_branch_url, root_directory_sha1[:7])
     )
 
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     nb_releases = len(origin_releases)
     if nb_releases > 0:
         assert_contains(resp, f'href="{escape(origin_releases_url)}"')
         assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     if path:
         query_params["path"] = path
 
     assert_contains(resp, '<li class="swh-branch">', count=len(origin_branches))
 
     for branch in origin_branches:
         query_params["branch"] = branch["name"]
         root_dir_branch_url = reverse(
             "browse-origin-directory", query_params=query_params
         )
 
         assert_contains(resp, '<a href="%s">' % root_dir_branch_url)
 
     assert_contains(resp, '<li class="swh-release">', count=len(origin_releases))
 
     query_params["branch"] = None
     for release in origin_releases:
         query_params["release"] = release["name"]
         root_dir_release_url = reverse(
             "browse-origin-directory", query_params=query_params
         )
 
         assert_contains(resp, 'href="%s"' % root_dir_release_url)
 
     assert_contains(resp, "vault-cook-directory")
     assert_contains(resp, "vault-cook-revision")
 
     snapshot = archive_data.snapshot_get(origin_visit["snapshot"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
 
     swhid_context = {
         "origin": origin_info["url"],
         "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         "anchor": gen_swhid(ObjectType.REVISION, head_rev_id),
         "path": f"/{path}" if path else None,
     }
 
     swh_dir_id = gen_swhid(
         ObjectType.DIRECTORY, directory_entries[0]["dir_id"], metadata=swhid_context
     )
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
     assert_contains(resp, "swh-take-new-snapshot")
 
     _check_origin_link(resp, origin_info["url"])
 
     assert_not_contains(resp, "swh-metadata-popover")
 
 
 def _origin_branches_test_helper(
     client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id=None
 ):
     query_params = {"origin_url": origin_info["url"], "snapshot": snapshot_id}
 
     url = reverse("browse-origin-branches", query_params=query_params)
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/branches.html"
     )
 
     origin_branches = origin_snapshot[0]
     origin_releases = origin_snapshot[1]
 
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     nb_releases = len(origin_releases)
     if nb_releases > 0:
         assert_contains(resp, f'href="{escape(origin_releases_url)}">')
         assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<tr class="swh-branch-entry', count=len(origin_branches))
 
     for branch in origin_branches:
         browse_branch_url = reverse(
             "browse-origin-directory",
             query_params={"branch": branch["name"], **query_params},
         )
         assert_contains(resp, '<a href="%s">' % escape(browse_branch_url))
 
         browse_revision_url = reverse(
             "browse-revision",
             url_args={"sha1_git": branch["revision"]},
             query_params=query_params,
         )
         assert_contains(resp, '<a href="%s">' % escape(browse_revision_url))
 
     _check_origin_link(resp, origin_info["url"])
 
 
 def _origin_releases_test_helper(
     client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id=None
 ):
     query_params = {"origin_url": origin_info["url"], "snapshot": snapshot_id}
 
     url = reverse("browse-origin-releases", query_params=query_params)
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/releases.html"
     )
 
     origin_releases = origin_snapshot[1]
 
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     nb_releases = len(origin_releases)
     if nb_releases > 0:
         assert_contains(resp, f'href="{escape(origin_releases_url)}"')
         assert_contains(resp, f"Releases ({snapshot_sizes['release']}")
 
     assert_contains(resp, '<tr class="swh-release-entry', count=nb_releases)
     assert_contains(resp, 'title="The release', count=nb_releases)
 
     for release in origin_releases:
         browse_release_url = reverse(
             "browse-release",
             url_args={"sha1_git": release["id"]},
             query_params=query_params,
         )
         browse_revision_url = reverse(
             "browse-revision",
             url_args={"sha1_git": release["target"]},
             query_params=query_params,
         )
 
         assert_contains(resp, '<a href="%s">' % escape(browse_release_url))
         assert_contains(resp, '<a href="%s">' % escape(browse_revision_url))
 
     _check_origin_link(resp, origin_info["url"])
 
 
 @given(
     new_origin(), visit_dates(),
 )
 def test_origin_branches_pagination_with_alias(
     client, archive_data, mocker, release, revisions_list, new_origin, visit_dates,
 ):
     """
     When a snapshot contains a branch or a release alias, pagination links
     in the branches / releases view should be displayed.
     """
     revisions = revisions_list(size=10)
     mocker.patch("swh.web.browse.snapshot_context.PER_PAGE", len(revisions) / 2)
     snp_dict = {"branches": {}, "id": hash_to_bytes(random_sha1())}
     for i in range(len(revisions)):
         branch = "".join(random.choices(string.ascii_lowercase, k=8))
         snp_dict["branches"][branch.encode()] = {
             "target_type": "revision",
             "target": hash_to_bytes(revisions[i]),
         }
     release_name = "".join(random.choices(string.ascii_lowercase, k=8))
     snp_dict["branches"][b"RELEASE_ALIAS"] = {
         "target_type": "alias",
         "target": release_name.encode(),
     }
     snp_dict["branches"][release_name.encode()] = {
         "target_type": "release",
         "target": hash_to_bytes(release),
     }
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
     visit = archive_data.origin_visit_add(
         [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="full",
         snapshot=snp_dict["id"],
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse("browse-origin-branches", query_params={"origin_url": new_origin.url})
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/branches.html"
     )
     assert_contains(resp, '<ul class="pagination')
 
 
 def _check_origin_link(resp, origin_url):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin_url}
     )
     assert_contains(resp, f'href="{browse_origin_url}"')
 
 
 def test_pull_request_branches_filtering(client, origin_with_pull_request_branches):
     origin_url = origin_with_pull_request_branches.url
     # check no pull request branches are displayed in the Branches / Releases dropdown
     url = reverse("browse-origin-directory", query_params={"origin_url": origin_url})
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     assert_not_contains(resp, "refs/pull/")
 
     # check no pull request branches are displayed in the branches view
     url = reverse("browse-origin-branches", query_params={"origin_url": origin_url})
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/branches.html"
     )
     assert_not_contains(resp, "refs/pull/")
 
 
 def test_browse_pull_request_branch(
     client, archive_data, origin_with_pull_request_branches
 ):
     origin_url = origin_with_pull_request_branches.url
     snapshot = archive_data.snapshot_get_latest(origin_url)
     pr_branch = random.choice(
         [
             branch
             for branch in snapshot["branches"].keys()
             if branch.startswith("refs/pull/")
         ]
     )
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin_url, "branch": pr_branch},
     )
     check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
diff --git a/swh/web/tests/browse/views/test_release.py b/swh/web/tests/browse/views/test_release.py
index 9ef7d970..35fe6395 100644
--- a/swh/web/tests/browse/views/test_release.py
+++ b/swh/web/tests/browse/views/test_release.py
@@ -1,166 +1,162 @@
 # Copyright (C) 2018-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 
-from hypothesis import given
-
 from django.utils.html import escape
 
 from swh.model.swhids import ObjectType
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import format_utc_iso_date, reverse
 from swh.web.tests.django_asserts import assert_contains
-from swh.web.tests.strategies import unknown_release
 from swh.web.tests.utils import check_html_get_response
 
 
 def test_release_browse(client, archive_data, release):
     _release_browse_checks(client, release, archive_data)
 
 
 def test_release_browse_with_origin_snapshot(
     client, archive_data, origin_with_releases
 ):
     origin_url = origin_with_releases["url"]
     snapshot = archive_data.snapshot_get_latest(origin_url)
     release = random.choice(
         [
             b["target"]
             for b in snapshot["branches"].values()
             if b["target_type"] == "release"
         ]
     )
 
     _release_browse_checks(client, release, archive_data, origin_url=origin_url)
     _release_browse_checks(client, release, archive_data, snapshot_id=snapshot["id"])
     _release_browse_checks(
         client,
         release,
         archive_data,
         origin_url=origin_url,
         snapshot_id=snapshot["id"],
     )
 
 
-@given(unknown_release())
 def test_release_browse_not_found(client, archive_data, unknown_release):
     url = reverse("browse-release", url_args={"sha1_git": unknown_release})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     err_msg = "Release with sha1_git %s not found" % unknown_release
     assert_contains(resp, err_msg, status_code=404)
 
 
 def test_release_uppercase(client, release):
     url = reverse(
         "browse-release-uppercase-checksum", url_args={"sha1_git": release.upper()}
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-release", url_args={"sha1_git": release})
 
     assert resp["location"] == redirect_url
 
 
 def _release_browse_checks(
     client, release, archive_data, origin_url=None, snapshot_id=None
 ):
     query_params = {"origin_url": origin_url, "snapshot": snapshot_id}
 
     url = reverse(
         "browse-release", url_args={"sha1_git": release}, query_params=query_params
     )
 
     release_data = archive_data.release_get(release)
 
     release_id = release_data["id"]
     release_name = release_data["name"]
     author_name = release_data["author"]["name"]
 
     release_date = release_data["date"]
     message = release_data["message"]
     target_type = release_data["target_type"]
     target = release_data["target"]
 
     target_url = reverse(
         "browse-revision", url_args={"sha1_git": target}, query_params=query_params
     )
     message_lines = message.split("\n")
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/release.html"
     )
     assert_contains(resp, author_name)
     assert_contains(resp, format_utc_iso_date(release_date))
     assert_contains(
         resp,
         "<h6>%s</h6>%s" % (message_lines[0] or "None", "\n".join(message_lines[1:])),
     )
     assert_contains(resp, release_id)
     assert_contains(resp, release_name)
     assert_contains(resp, target_type)
     assert_contains(resp, '<a href="%s">%s</a>' % (escape(target_url), target))
 
     swh_rel_id = gen_swhid(ObjectType.RELEASE, release_id)
     swh_rel_id_url = reverse("browse-swhid", url_args={"swhid": swh_rel_id})
     assert_contains(resp, swh_rel_id)
     assert_contains(resp, swh_rel_id_url)
 
     if origin_url:
         browse_origin_url = reverse(
             "browse-origin", query_params={"origin_url": origin_url}
         )
         assert_contains(resp, f'href="{browse_origin_url}"')
     elif snapshot_id:
         swh_snp_id = gen_swhid(ObjectType.SNAPSHOT, snapshot_id)
         swh_snp_id_url = reverse("browse-swhid", url_args={"swhid": swh_snp_id})
         assert_contains(resp, f'href="{swh_snp_id_url}"')
 
     if release_data["target_type"] == "revision":
         rev = archive_data.revision_get(release_data["target"])
         rev_dir = rev["directory"]
         rev_metadata = {}
         dir_metadata = {}
         if origin_url:
             directory_url = reverse(
                 "browse-origin-directory",
                 query_params={
                     "origin_url": origin_url,
                     "release": release_data["name"],
                     "snapshot": snapshot_id,
                 },
             )
             rev_metadata["origin"] = dir_metadata["origin"] = origin_url
             snapshot = archive_data.snapshot_get_latest(origin_url)
             rev_metadata["visit"] = dir_metadata["visit"] = gen_swhid(
                 ObjectType.SNAPSHOT, snapshot["id"]
             )
             dir_metadata["anchor"] = gen_swhid(ObjectType.RELEASE, release_id)
 
         elif snapshot_id:
             directory_url = reverse(
                 "browse-snapshot-directory",
                 url_args={"snapshot_id": snapshot_id},
                 query_params={"release": release_data["name"],},
             )
             rev_metadata["visit"] = dir_metadata["visit"] = gen_swhid(
                 ObjectType.SNAPSHOT, snapshot_id
             )
             dir_metadata["anchor"] = gen_swhid(ObjectType.RELEASE, release_id)
         else:
             directory_url = reverse("browse-directory", url_args={"sha1_git": rev_dir})
         assert_contains(resp, escape(directory_url))
 
         swh_rev_id = gen_swhid(ObjectType.REVISION, rev["id"], metadata=rev_metadata)
         swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
         assert_contains(resp, swh_rev_id_url)
 
         swh_dir_id = gen_swhid(ObjectType.DIRECTORY, rev_dir, metadata=dir_metadata)
         swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
         assert_contains(resp, swh_dir_id_url)
diff --git a/swh/web/tests/browse/views/test_revision.py b/swh/web/tests/browse/views/test_revision.py
index b9ac7fb0..34d65384 100644
--- a/swh/web/tests/browse/views/test_revision.py
+++ b/swh/web/tests/browse/views/test_revision.py
@@ -1,340 +1,335 @@
 # Copyright (C) 2017-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import json
 import random
 
 from hypothesis import given
 
 from django.utils.html import escape
 
 from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.model import Revision, RevisionType, TimestampWithTimezone
 from swh.model.swhids import ObjectType
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import format_utc_iso_date, parse_iso8601_date_to_utc, reverse
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import (
-    new_origin,
-    new_person,
-    new_swh_date,
-    unknown_revision,
-)
+from swh.web.tests.strategies import new_origin, new_person, new_swh_date
 from swh.web.tests.utils import check_html_get_response
 
 
 def test_revision_browse(client, archive_data, revision):
     _revision_browse_checks(client, archive_data, revision)
 
 
 def test_revision_origin_snapshot_browse(client, archive_data, swh_scheduler, origin):
     snapshot = archive_data.snapshot_get_latest(origin["url"])
     revision = archive_data.snapshot_get_head(snapshot)
 
     _revision_browse_checks(client, archive_data, revision, origin_url=origin["url"])
     _revision_browse_checks(client, archive_data, revision, snapshot=snapshot)
     _revision_browse_checks(
         client, archive_data, revision, origin_url=origin["url"], snapshot=snapshot,
     )
 
     revision = random.choice(archive_data.revision_log(revision))["id"]
     _revision_browse_checks(client, archive_data, revision, origin_url=origin["url"])
 
 
 def test_revision_log_browse(client, archive_data, revision):
     per_page = 10
 
     revision_log = archive_data.revision_log(revision)
 
     revision_log_sorted = sorted(
         revision_log,
         key=lambda rev: -parse_iso8601_date_to_utc(rev["committer_date"]).timestamp(),
     )
 
     url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"per_page": per_page},
     )
 
     next_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": per_page, "per_page": per_page,},
     )
 
     nb_log_entries = per_page
     if len(revision_log_sorted) < per_page:
         nb_log_entries = len(revision_log_sorted)
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/revision-log.html"
     )
     assert_contains(resp, '<tr class="swh-revision-log-entry', count=nb_log_entries)
     assert_contains(resp, '<a class="page-link">Newer</a>')
 
     if len(revision_log_sorted) > per_page:
         assert_contains(
             resp, '<a class="page-link" href="%s">Older</a>' % escape(next_page_url),
         )
 
     for log in revision_log_sorted[:per_page]:
         revision_url = reverse("browse-revision", url_args={"sha1_git": log["id"]})
         assert_contains(resp, log["id"][:7])
         assert_contains(resp, log["author"]["name"])
         assert_contains(resp, format_utc_iso_date(log["date"]))
         assert_contains(resp, escape(log["message"]))
         assert_contains(resp, format_utc_iso_date(log["committer_date"]))
         assert_contains(resp, revision_url)
 
     if len(revision_log_sorted) <= per_page:
         return
 
     resp = check_html_get_response(
         client, next_page_url, status_code=200, template_used="browse/revision-log.html"
     )
 
     prev_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": 0, "per_page": per_page},
     )
     next_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": 2 * per_page, "per_page": per_page},
     )
 
     nb_log_entries = len(revision_log_sorted) - per_page
     if nb_log_entries > per_page:
         nb_log_entries = per_page
 
     assert_contains(resp, '<tr class="swh-revision-log-entry', count=nb_log_entries)
 
     assert_contains(
         resp, '<a class="page-link" href="%s">Newer</a>' % escape(prev_page_url)
     )
 
     if len(revision_log_sorted) > 2 * per_page:
         assert_contains(
             resp, '<a class="page-link" href="%s">Older</a>' % escape(next_page_url),
         )
 
     if len(revision_log_sorted) <= 2 * per_page:
         return
 
     resp = check_html_get_response(
         client, next_page_url, status_code=200, template_used="browse/revision-log.html"
     )
 
     prev_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": per_page, "per_page": per_page},
     )
     next_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": 3 * per_page, "per_page": per_page},
     )
 
     nb_log_entries = len(revision_log_sorted) - 2 * per_page
     if nb_log_entries > per_page:
         nb_log_entries = per_page
 
     assert_contains(resp, '<tr class="swh-revision-log-entry', count=nb_log_entries)
     assert_contains(
         resp, '<a class="page-link" href="%s">Newer</a>' % escape(prev_page_url)
     )
 
     if len(revision_log_sorted) > 3 * per_page:
         assert_contains(
             resp, '<a class="page-link" href="%s">Older</a>' % escape(next_page_url),
         )
 
 
-@given(unknown_revision(), new_origin())
+@given(new_origin())
 def test_revision_request_errors(client, revision, unknown_revision, new_origin):
     url = reverse("browse-revision", url_args={"sha1_git": unknown_revision})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(
         resp, "Revision with sha1_git %s not found" % unknown_revision, status_code=404
     )
 
     url = reverse(
         "browse-revision",
         url_args={"sha1_git": revision},
         query_params={"origin_url": new_origin.url},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(
         resp, "the origin mentioned in your request" " appears broken", status_code=404
     )
 
 
 def test_revision_uppercase(client, revision):
     url = reverse(
         "browse-revision-uppercase-checksum", url_args={"sha1_git": revision.upper()}
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-revision", url_args={"sha1_git": revision})
 
     assert resp["location"] == redirect_url
 
 
 def _revision_browse_checks(
     client, archive_data, revision, origin_url=None, snapshot=None
 ):
 
     query_params = {}
     if origin_url:
         query_params["origin_url"] = origin_url
     if snapshot:
         query_params["snapshot"] = snapshot["id"]
 
     url = reverse(
         "browse-revision", url_args={"sha1_git": revision}, query_params=query_params
     )
 
     revision_data = archive_data.revision_get(revision)
 
     author_name = revision_data["author"]["name"]
     committer_name = revision_data["committer"]["name"]
     dir_id = revision_data["directory"]
 
     if origin_url:
         snapshot = archive_data.snapshot_get_latest(origin_url)
         history_url = reverse(
             "browse-origin-log", query_params={"revision": revision, **query_params},
         )
     elif snapshot:
         history_url = reverse(
             "browse-snapshot-log",
             url_args={"snapshot_id": snapshot["id"]},
             query_params={"revision": revision},
         )
     else:
         history_url = reverse("browse-revision-log", url_args={"sha1_git": revision})
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/revision.html"
     )
     assert_contains(resp, author_name)
     assert_contains(resp, committer_name)
     assert_contains(resp, history_url)
 
     for parent in revision_data["parents"]:
         parent_url = reverse(
             "browse-revision", url_args={"sha1_git": parent}, query_params=query_params
         )
         assert_contains(resp, '<a href="%s">%s</a>' % (escape(parent_url), parent[:7]))
 
     author_date = revision_data["date"]
     committer_date = revision_data["committer_date"]
 
     message_lines = revision_data["message"].split("\n")
 
     assert_contains(resp, format_utc_iso_date(author_date))
     assert_contains(resp, format_utc_iso_date(committer_date))
     assert_contains(resp, escape(message_lines[0]))
     assert_contains(resp, escape("\n".join(message_lines[1:])))
 
     assert_contains(resp, "vault-cook-directory")
     assert_contains(resp, "vault-cook-revision")
 
     swh_rev_id = gen_swhid(ObjectType.REVISION, revision)
     swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
     assert_contains(resp, swh_rev_id)
     assert_contains(resp, swh_rev_id_url)
 
     swh_dir_id = gen_swhid(ObjectType.DIRECTORY, dir_id)
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
     if origin_url:
         assert_contains(resp, "swh-take-new-snapshot")
 
     swh_rev_id = gen_swhid(ObjectType.REVISION, revision)
     swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
 
     if origin_url:
         browse_origin_url = reverse(
             "browse-origin", query_params={"origin_url": origin_url}
         )
         assert_contains(resp, f'href="{browse_origin_url}"')
     elif snapshot:
         swh_snp_id = gen_swhid(ObjectType.SNAPSHOT, snapshot["id"])
         swh_snp_id_url = reverse("browse-swhid", url_args={"swhid": swh_snp_id})
         assert_contains(resp, f'href="{swh_snp_id_url}"')
 
     swhid_context = {}
     if origin_url:
         swhid_context["origin"] = origin_url
     if snapshot:
         swhid_context["visit"] = gen_swhid(ObjectType.SNAPSHOT, snapshot["id"])
 
     swh_rev_id = gen_swhid(ObjectType.REVISION, revision, metadata=swhid_context)
     swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
     assert_contains(resp, swh_rev_id)
     assert_contains(resp, swh_rev_id_url)
 
     swhid_context["anchor"] = gen_swhid(ObjectType.REVISION, revision)
 
     swh_dir_id = gen_swhid(ObjectType.DIRECTORY, dir_id, metadata=swhid_context)
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
 
 def test_revision_invalid_path(client, archive_data, revision):
     path = "foo/bar"
     url = reverse(
         "browse-revision", url_args={"sha1_git": revision}, query_params={"path": path}
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="browse/revision.html"
     )
 
     directory = archive_data.revision_get(revision)["directory"]
     error_message = (
         f"Directory entry with path {path} from root directory {directory} not found"
     )
     assert_contains(resp, error_message, status_code=404)
     assert_not_contains(resp, "swh-metadata-popover", status_code=404)
 
 
 @given(new_person(), new_swh_date())
 def test_revision_metadata_display(archive_data, client, directory, person, date):
     metadata = {"foo": "bar"}
     revision = Revision(
         directory=hash_to_bytes(directory),
         author=person,
         committer=person,
         message=b"commit message",
         date=TimestampWithTimezone.from_datetime(date),
         committer_date=TimestampWithTimezone.from_datetime(date),
         synthetic=False,
         type=RevisionType.GIT,
         metadata=metadata,
     )
     archive_data.revision_add([revision])
 
     url = reverse("browse-revision", url_args={"sha1_git": hash_to_hex(revision.id)})
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/revision.html"
     )
     assert_contains(resp, "swh-metadata-popover")
     assert_contains(resp, escape(json.dumps(metadata, indent=4)))
diff --git a/swh/web/tests/common/test_archive.py b/swh/web/tests/common/test_archive.py
index d2508336..e455011a 100644
--- a/swh/web/tests/common/test_archive.py
+++ b/swh/web/tests/common/test_archive.py
@@ -1,1170 +1,1144 @@
 # Copyright (C) 2015-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from collections import defaultdict
 import hashlib
 import itertools
 import random
 
 from hypothesis import given
 import pytest
 
 from swh.model.from_disk import DentryPerms
 from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.model import (
     Directory,
     DirectoryEntry,
     Origin,
     OriginVisit,
     Revision,
     Snapshot,
     SnapshotBranch,
     TargetType,
 )
 from swh.model.swhids import ObjectType
 from swh.web.common import archive
 from swh.web.common.exc import BadInputExc, NotFoundExc
 from swh.web.common.typing import OriginInfo, PagedResult
 from swh.web.tests.conftest import ctags_json_missing, fossology_missing
 from swh.web.tests.data import random_content, random_sha1
-from swh.web.tests.strategies import (
-    invalid_sha1,
-    new_origin,
-    new_revision,
-    sha256,
-    unknown_content,
-    unknown_contents,
-    unknown_directory,
-    unknown_release,
-    unknown_revision,
-    unknown_snapshot,
-    visit_dates,
-)
+from swh.web.tests.strategies import new_origin, new_revision, visit_dates
 
 
 def test_lookup_multiple_hashes_all_present(contents):
     input_data = []
     expected_output = []
     for cnt in contents:
         input_data.append({"sha1": cnt["sha1"]})
         expected_output.append({"sha1": cnt["sha1"], "found": True})
 
     assert archive.lookup_multiple_hashes(input_data) == expected_output
 
 
-@given(unknown_contents())
 def test_lookup_multiple_hashes_some_missing(contents, unknown_contents):
     input_contents = list(itertools.chain(contents, unknown_contents))
     random.shuffle(input_contents)
 
     input_data = []
     expected_output = []
     for cnt in input_contents:
         input_data.append({"sha1": cnt["sha1"]})
         expected_output.append({"sha1": cnt["sha1"], "found": cnt in contents})
 
     assert archive.lookup_multiple_hashes(input_data) == expected_output
 
 
 def test_lookup_hash_does_not_exist():
     unknown_content_ = random_content()
 
     actual_lookup = archive.lookup_hash("sha1_git:%s" % unknown_content_["sha1_git"])
 
     assert actual_lookup == {"found": None, "algo": "sha1_git"}
 
 
 def test_lookup_hash_exist(archive_data, content):
     actual_lookup = archive.lookup_hash("sha1:%s" % content["sha1"])
 
     content_metadata = archive_data.content_get(content["sha1"])
 
     assert {"found": content_metadata, "algo": "sha1"} == actual_lookup
 
 
 def test_search_hash_does_not_exist():
     unknown_content_ = random_content()
 
     actual_lookup = archive.search_hash("sha1_git:%s" % unknown_content_["sha1_git"])
 
     assert {"found": False} == actual_lookup
 
 
 def test_search_hash_exist(content):
     actual_lookup = archive.search_hash("sha1:%s" % content["sha1"])
 
     assert {"found": True} == actual_lookup
 
 
 @pytest.mark.skipif(
     ctags_json_missing, reason="requires ctags with json output support"
 )
 def test_lookup_content_ctags(indexer_data, contents_with_ctags):
     content_sha1 = random.choice(contents_with_ctags["sha1s"])
     indexer_data.content_add_ctags(content_sha1)
     actual_ctags = list(archive.lookup_content_ctags("sha1:%s" % content_sha1))
 
     expected_data = list(indexer_data.content_get_ctags(content_sha1))
     for ctag in expected_data:
         ctag["id"] = content_sha1
 
     assert actual_ctags == expected_data
 
 
 def test_lookup_content_ctags_no_hash():
     unknown_content_ = random_content()
 
     actual_ctags = list(
         archive.lookup_content_ctags("sha1:%s" % unknown_content_["sha1"])
     )
 
     assert actual_ctags == []
 
 
 def test_lookup_content_filetype(indexer_data, content):
     indexer_data.content_add_mimetype(content["sha1"])
     actual_filetype = archive.lookup_content_filetype(content["sha1"])
 
     expected_filetype = indexer_data.content_get_mimetype(content["sha1"])
     assert actual_filetype == expected_filetype
 
 
 def test_lookup_expression(indexer_data, contents_with_ctags):
     per_page = 10
     expected_ctags = []
 
     for content_sha1 in contents_with_ctags["sha1s"]:
         if len(expected_ctags) == per_page:
             break
         indexer_data.content_add_ctags(content_sha1)
         for ctag in indexer_data.content_get_ctags(content_sha1):
             if len(expected_ctags) == per_page:
                 break
             if ctag["name"] == contents_with_ctags["symbol_name"]:
                 del ctag["id"]
                 ctag["sha1"] = content_sha1
                 expected_ctags.append(ctag)
 
     actual_ctags = list(
         archive.lookup_expression(
             contents_with_ctags["symbol_name"], last_sha1=None, per_page=10
         )
     )
 
     assert actual_ctags == expected_ctags
 
 
 def test_lookup_expression_no_result():
     expected_ctags = []
 
     actual_ctags = list(
         archive.lookup_expression("barfoo", last_sha1=None, per_page=10)
     )
     assert actual_ctags == expected_ctags
 
 
 @pytest.mark.skipif(fossology_missing, reason="requires fossology-nomossa installed")
 def test_lookup_content_license(indexer_data, content):
     indexer_data.content_add_license(content["sha1"])
     actual_license = archive.lookup_content_license(content["sha1"])
 
     expected_license = indexer_data.content_get_license(content["sha1"])
     assert actual_license == expected_license
 
 
 def test_stat_counters(archive_data):
     actual_stats = archive.stat_counters()
     assert actual_stats == archive_data.stat_counters()
 
 
 @given(new_origin(), visit_dates())
 def test_lookup_origin_visits(subtest, new_origin, visit_dates):
     # ensure archive_data fixture will be reset between each hypothesis
     # example test run
     @subtest
     def test_inner(archive_data):
         archive_data.origin_add([new_origin])
 
         archive_data.origin_visit_add(
             [
                 OriginVisit(origin=new_origin.url, date=ts, type="git",)
                 for ts in visit_dates
             ]
         )
 
         actual_origin_visits = list(
             archive.lookup_origin_visits(new_origin.url, per_page=100)
         )
 
         expected_visits = archive_data.origin_visit_get(new_origin.url)
         for expected_visit in expected_visits:
             expected_visit["origin"] = new_origin.url
 
         assert actual_origin_visits == expected_visits
 
 
 @given(new_origin(), visit_dates())
 def test_lookup_origin_visit(archive_data, new_origin, visit_dates):
     archive_data.origin_add([new_origin])
     visits = archive_data.origin_visit_add(
         [OriginVisit(origin=new_origin.url, date=ts, type="git",) for ts in visit_dates]
     )
 
     visit = random.choice(visits).visit
     actual_origin_visit = archive.lookup_origin_visit(new_origin.url, visit)
 
     expected_visit = dict(archive_data.origin_visit_get_by(new_origin.url, visit))
 
     assert actual_origin_visit == expected_visit
 
 
 @given(new_origin())
 def test_lookup_origin(archive_data, new_origin):
     archive_data.origin_add([new_origin])
 
     actual_origin = archive.lookup_origin({"url": new_origin.url})
     expected_origin = archive_data.origin_get([new_origin.url])[0]
     assert actual_origin == expected_origin
 
 
-@given(invalid_sha1())
 def test_lookup_release_ko_id_checksum_not_a_sha1(invalid_sha1):
     with pytest.raises(BadInputExc) as e:
         archive.lookup_release(invalid_sha1)
     assert e.match("Invalid checksum")
 
 
-@given(sha256())
 def test_lookup_release_ko_id_checksum_too_long(sha256):
     with pytest.raises(BadInputExc) as e:
         archive.lookup_release(sha256)
     assert e.match("Only sha1_git is supported.")
 
 
 def test_lookup_release_multiple(archive_data, releases):
     actual_releases = list(archive.lookup_release_multiple(releases))
 
     expected_releases = []
     for release_id in releases:
         release_info = archive_data.release_get(release_id)
         expected_releases.append(release_info)
 
     assert actual_releases == expected_releases
 
 
 def test_lookup_release_multiple_none_found():
     unknown_releases_ = [random_sha1(), random_sha1(), random_sha1()]
 
     actual_releases = list(archive.lookup_release_multiple(unknown_releases_))
 
     assert actual_releases == [None] * len(unknown_releases_)
 
 
 def test_lookup_directory_with_path_not_found(directory):
     path = "some/invalid/path/here"
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_directory_with_path(directory, path)
     assert e.match(
         f"Directory entry with path {path} from root directory {directory} not found"
     )
 
 
 def test_lookup_directory_with_path_found(archive_data, directory):
     directory_content = archive_data.directory_ls(directory)
     directory_entry = random.choice(directory_content)
     path = directory_entry["name"]
     actual_result = archive.lookup_directory_with_path(directory, path)
     assert actual_result == directory_entry
 
 
 def test_lookup_release(archive_data, release):
     actual_release = archive.lookup_release(release)
 
     assert actual_release == archive_data.release_get(release)
 
 
-@given(invalid_sha1(), sha256())
 def test_lookup_revision_with_context_ko_not_a_sha1(revision, invalid_sha1, sha256):
     sha1_git_root = revision
     sha1_git = invalid_sha1
 
     with pytest.raises(BadInputExc) as e:
         archive.lookup_revision_with_context(sha1_git_root, sha1_git)
     assert e.match("Invalid checksum query string")
 
     sha1_git = sha256
 
     with pytest.raises(BadInputExc) as e:
         archive.lookup_revision_with_context(sha1_git_root, sha1_git)
     assert e.match("Only sha1_git is supported")
 
 
-@given(unknown_revision())
 def test_lookup_revision_with_context_ko_sha1_git_does_not_exist(
     revision, unknown_revision
 ):
     sha1_git_root = revision
     sha1_git = unknown_revision
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_revision_with_context(sha1_git_root, sha1_git)
     assert e.match("Revision %s not found" % sha1_git)
 
 
-@given(unknown_revision())
 def test_lookup_revision_with_context_ko_root_sha1_git_does_not_exist(
     revision, unknown_revision
 ):
     sha1_git_root = unknown_revision
     sha1_git = revision
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_revision_with_context(sha1_git_root, sha1_git)
     assert e.match("Revision root %s not found" % sha1_git_root)
 
 
 def test_lookup_revision_with_context(archive_data, ancestor_revisions):
     sha1_git = ancestor_revisions["sha1_git"]
     root_sha1_git = ancestor_revisions["sha1_git_root"]
     for sha1_git_root in (root_sha1_git, {"id": hash_to_bytes(root_sha1_git)}):
         actual_revision = archive.lookup_revision_with_context(sha1_git_root, sha1_git)
 
         children = []
         for rev in archive_data.revision_log(root_sha1_git):
             for p_rev in rev["parents"]:
                 p_rev_hex = hash_to_hex(p_rev)
                 if p_rev_hex == sha1_git:
                     children.append(rev["id"])
 
         expected_revision = archive_data.revision_get(sha1_git)
         expected_revision["children"] = children
         assert actual_revision == expected_revision
 
 
 def test_lookup_revision_with_context_ko(non_ancestor_revisions):
     sha1_git = non_ancestor_revisions["sha1_git"]
     root_sha1_git = non_ancestor_revisions["sha1_git_root"]
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_revision_with_context(root_sha1_git, sha1_git)
     assert e.match("Revision %s is not an ancestor of %s" % (sha1_git, root_sha1_git))
 
 
 def test_lookup_directory_with_revision_not_found():
     unknown_revision_ = random_sha1()
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_directory_with_revision(unknown_revision_)
     assert e.match("Revision %s not found" % unknown_revision_)
 
 
 @given(new_revision())
 def test_lookup_directory_with_revision_unknown_content(archive_data, new_revision):
     unknown_content_ = random_content()
 
     dir_path = "README.md"
 
     # A directory that points to unknown content
     dir = Directory(
         entries=(
             DirectoryEntry(
                 name=bytes(dir_path.encode("utf-8")),
                 type="file",
                 target=hash_to_bytes(unknown_content_["sha1_git"]),
                 perms=DentryPerms.content,
             ),
         )
     )
 
     # Create a revision that points to a directory
     # Which points to unknown content
     new_revision = new_revision.to_dict()
     new_revision["directory"] = dir.id
     del new_revision["id"]
     new_revision = Revision.from_dict(new_revision)
 
     # Add the directory and revision in mem
     archive_data.directory_add([dir])
     archive_data.revision_add([new_revision])
     new_revision_id = hash_to_hex(new_revision.id)
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_directory_with_revision(new_revision_id, dir_path)
     assert e.match("Content not found for revision %s" % new_revision_id)
 
 
 def test_lookup_directory_with_revision_ko_path_to_nowhere(revision):
     invalid_path = "path/to/something/unknown"
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_directory_with_revision(revision, invalid_path)
     assert e.match("Directory or File")
     assert e.match(invalid_path)
     assert e.match("revision %s" % revision)
     assert e.match("not found")
 
 
 def test_lookup_directory_with_revision_submodules(
     archive_data, revision_with_submodules
 ):
     rev_sha1_git = revision_with_submodules["rev_sha1_git"]
     rev_dir_path = revision_with_submodules["rev_dir_rev_path"]
 
     actual_data = archive.lookup_directory_with_revision(rev_sha1_git, rev_dir_path)
 
     revision = archive_data.revision_get(revision_with_submodules["rev_sha1_git"])
     directory = archive_data.directory_ls(revision["directory"])
     rev_entry = next(e for e in directory if e["name"] == rev_dir_path)
 
     expected_data = {
         "content": archive_data.revision_get(rev_entry["target"]),
         "path": rev_dir_path,
         "revision": rev_sha1_git,
         "type": "rev",
     }
 
     assert actual_data == expected_data
 
 
 def test_lookup_directory_with_revision_without_path(archive_data, revision):
     actual_directory_entries = archive.lookup_directory_with_revision(revision)
 
     revision_data = archive_data.revision_get(revision)
     expected_directory_entries = archive_data.directory_ls(revision_data["directory"])
 
     assert actual_directory_entries["type"] == "dir"
     assert actual_directory_entries["content"] == expected_directory_entries
 
 
 def test_lookup_directory_with_revision_with_path(archive_data, revision):
     rev_data = archive_data.revision_get(revision)
     dir_entries = [
         e
         for e in archive_data.directory_ls(rev_data["directory"])
         if e["type"] in ("file", "dir")
     ]
     expected_dir_entry = random.choice(dir_entries)
 
     actual_dir_entry = archive.lookup_directory_with_revision(
         revision, expected_dir_entry["name"]
     )
 
     assert actual_dir_entry["type"] == expected_dir_entry["type"]
     assert actual_dir_entry["revision"] == revision
     assert actual_dir_entry["path"] == expected_dir_entry["name"]
     if actual_dir_entry["type"] == "file":
         del actual_dir_entry["content"]["checksums"]["blake2s256"]
         for key in ("checksums", "status", "length"):
             assert actual_dir_entry["content"][key] == expected_dir_entry[key]
     else:
         sub_dir_entries = archive_data.directory_ls(expected_dir_entry["target"])
         assert actual_dir_entry["content"] == sub_dir_entries
 
 
 def test_lookup_directory_with_revision_with_path_to_file_and_data(
     archive_data, revision
 ):
     rev_data = archive_data.revision_get(revision)
     dir_entries = [
         e
         for e in archive_data.directory_ls(rev_data["directory"])
         if e["type"] == "file"
     ]
     expected_dir_entry = random.choice(dir_entries)
     expected_data = archive_data.content_get_data(
         expected_dir_entry["checksums"]["sha1"]
     )
 
     actual_dir_entry = archive.lookup_directory_with_revision(
         revision, expected_dir_entry["name"], with_data=True
     )
 
     assert actual_dir_entry["type"] == expected_dir_entry["type"]
     assert actual_dir_entry["revision"] == revision
     assert actual_dir_entry["path"] == expected_dir_entry["name"]
     del actual_dir_entry["content"]["checksums"]["blake2s256"]
     for key in ("checksums", "status", "length"):
         assert actual_dir_entry["content"][key] == expected_dir_entry[key]
     assert actual_dir_entry["content"]["data"] == expected_data["data"]
 
 
 def test_lookup_revision(archive_data, revision):
     actual_revision = archive.lookup_revision(revision)
     assert actual_revision == archive_data.revision_get(revision)
 
 
 @given(new_revision())
 def test_lookup_revision_invalid_msg(archive_data, new_revision):
     new_revision = new_revision.to_dict()
     new_revision["message"] = b"elegant fix for bug \xff"
     archive_data.revision_add([Revision.from_dict(new_revision)])
 
     revision = archive.lookup_revision(hash_to_hex(new_revision["id"]))
     assert revision["message"] == "elegant fix for bug \\xff"
-    assert revision["decoding_failures"] == ["message"]
+    assert "message" in revision["decoding_failures"]
 
 
 @given(new_revision())
 def test_lookup_revision_msg_ok(archive_data, new_revision):
     archive_data.revision_add([new_revision])
 
     revision_message = archive.lookup_revision_message(hash_to_hex(new_revision.id))
 
     assert revision_message == {"message": new_revision.message}
 
 
 def test_lookup_revision_msg_no_rev():
     unknown_revision_ = random_sha1()
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_revision_message(unknown_revision_)
 
     assert e.match("Revision with sha1_git %s not found." % unknown_revision_)
 
 
 def test_lookup_revision_multiple(archive_data, revisions):
     actual_revisions = list(archive.lookup_revision_multiple(revisions))
 
     expected_revisions = []
     for rev in revisions:
         expected_revisions.append(archive_data.revision_get(rev))
 
     assert actual_revisions == expected_revisions
 
 
 def test_lookup_revision_multiple_none_found():
     unknown_revisions_ = [random_sha1(), random_sha1(), random_sha1()]
 
     actual_revisions = list(archive.lookup_revision_multiple(unknown_revisions_))
 
     assert actual_revisions == [None] * len(unknown_revisions_)
 
 
 def test_lookup_revision_log(archive_data, revision):
     actual_revision_log = list(archive.lookup_revision_log(revision, limit=25))
     expected_revision_log = archive_data.revision_log(revision, limit=25)
 
     assert actual_revision_log == expected_revision_log
 
 
 def _get_origin_branches(archive_data, origin):
     origin_visit = archive_data.origin_visit_get(origin["url"])[-1]
     snapshot = archive_data.snapshot_get(origin_visit["snapshot"])
     branches = {
         k: v
         for (k, v) in snapshot["branches"].items()
         if v["target_type"] == "revision"
     }
     return branches
 
 
 def test_lookup_revision_log_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
 
     actual_log = list(
         archive.lookup_revision_log_by(origin["url"], branch_name, None, limit=25)
     )
 
     expected_log = archive_data.revision_log(branches[branch_name]["target"], limit=25)
 
     assert actual_log == expected_log
 
 
 def test_lookup_revision_log_by_notfound(origin):
     with pytest.raises(NotFoundExc):
         archive.lookup_revision_log_by(
             origin["url"], "unknown_branch_name", None, limit=100
         )
 
 
 def test_lookup_content_raw_not_found():
     unknown_content_ = random_content()
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_content_raw("sha1:" + unknown_content_["sha1"])
 
     assert e.match(
         "Content with %s checksum equals to %s not found!"
         % ("sha1", unknown_content_["sha1"])
     )
 
 
 def test_lookup_content_raw(archive_data, content):
     actual_content = archive.lookup_content_raw("sha256:%s" % content["sha256"])
 
     expected_content = archive_data.content_get_data(content["sha1"])
 
     assert actual_content == expected_content
 
 
 def test_lookup_empty_content_raw(empty_content):
     content_raw = archive.lookup_content_raw(f"sha1_git:{empty_content['sha1_git']}")
     assert content_raw["data"] == b""
 
 
 def test_lookup_content_not_found():
     unknown_content_ = random_content()
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_content("sha1:%s" % unknown_content_["sha1"])
 
     assert e.match(
         "Content with %s checksum equals to %s not found!"
         % ("sha1", unknown_content_["sha1"])
     )
 
 
 def test_lookup_content_with_sha1(archive_data, content):
     actual_content = archive.lookup_content(f"sha1:{content['sha1']}")
 
     expected_content = archive_data.content_get(content["sha1"])
 
     assert actual_content == expected_content
 
 
 def test_lookup_content_with_sha256(archive_data, content):
     actual_content = archive.lookup_content(f"sha256:{content['sha256']}")
 
     expected_content = archive_data.content_get(content["sha1"])
 
     assert actual_content == expected_content
 
 
 def test_lookup_directory_bad_checksum():
     with pytest.raises(BadInputExc):
         archive.lookup_directory("directory_id")
 
 
 def test_lookup_directory_not_found():
     unknown_directory_ = random_sha1()
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_directory(unknown_directory_)
 
     assert e.match("Directory with sha1_git %s not found" % unknown_directory_)
 
 
 def test_lookup_directory(archive_data, directory):
     actual_directory_ls = list(archive.lookup_directory(directory))
 
     expected_directory_ls = archive_data.directory_ls(directory)
 
     assert actual_directory_ls == expected_directory_ls
 
 
 def test_lookup_directory_empty(empty_directory):
     actual_directory_ls = list(archive.lookup_directory(empty_directory))
 
     assert actual_directory_ls == []
 
 
 def test_lookup_revision_by_nothing_found(origin):
     with pytest.raises(NotFoundExc):
         archive.lookup_revision_by(origin["url"], "invalid-branch-name")
 
 
 def test_lookup_revision_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
 
     actual_revision = archive.lookup_revision_by(origin["url"], branch_name)
 
     expected_revision = archive_data.revision_get(branches[branch_name]["target"])
 
     assert actual_revision == expected_revision
 
 
 def test_lookup_revision_with_context_by_ko(origin, revision):
     with pytest.raises(NotFoundExc):
         archive.lookup_revision_with_context_by(
             origin["url"], "invalid-branch-name", None, revision
         )
 
 
 def test_lookup_revision_with_context_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
 
     root_rev = branches[branch_name]["target"]
     root_rev_log = archive_data.revision_log(root_rev)
 
     children = defaultdict(list)
 
     for rev in root_rev_log:
         for rev_p in rev["parents"]:
             children[rev_p].append(rev["id"])
 
     rev = root_rev_log[-1]["id"]
 
     actual_root_rev, actual_rev = archive.lookup_revision_with_context_by(
         origin["url"], branch_name, None, rev
     )
 
     expected_root_rev = archive_data.revision_get(root_rev)
     expected_rev = archive_data.revision_get(rev)
     expected_rev["children"] = children[rev]
 
     assert actual_root_rev == expected_root_rev
     assert actual_rev == expected_rev
 
 
 def test_lookup_revision_through_ko_not_implemented():
     with pytest.raises(NotImplementedError):
         archive.lookup_revision_through({"something-unknown": 10})
 
 
 def test_lookup_revision_through_with_context_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
 
     root_rev = branches[branch_name]["target"]
     root_rev_log = archive_data.revision_log(root_rev)
     rev = root_rev_log[-1]["id"]
 
     assert archive.lookup_revision_through(
         {
             "origin_url": origin["url"],
             "branch_name": branch_name,
             "ts": None,
             "sha1_git": rev,
         }
     ) == archive.lookup_revision_with_context_by(origin["url"], branch_name, None, rev)
 
 
 def test_lookup_revision_through_with_revision_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
 
     assert archive.lookup_revision_through(
         {"origin_url": origin["url"], "branch_name": branch_name, "ts": None,}
     ) == archive.lookup_revision_by(origin["url"], branch_name, None)
 
 
 def test_lookup_revision_through_with_context(ancestor_revisions):
     sha1_git = ancestor_revisions["sha1_git"]
     sha1_git_root = ancestor_revisions["sha1_git_root"]
 
     assert archive.lookup_revision_through(
         {"sha1_git_root": sha1_git_root, "sha1_git": sha1_git,}
     ) == archive.lookup_revision_with_context(sha1_git_root, sha1_git)
 
 
 def test_lookup_revision_through_with_revision(revision):
     assert archive.lookup_revision_through(
         {"sha1_git": revision}
     ) == archive.lookup_revision(revision)
 
 
 def test_lookup_directory_through_revision_ko_not_found(revision):
     with pytest.raises(NotFoundExc):
         archive.lookup_directory_through_revision(
             {"sha1_git": revision}, "some/invalid/path"
         )
 
 
 def test_lookup_directory_through_revision_ok(archive_data, revision):
     rev_data = archive_data.revision_get(revision)
     dir_entries = [
         e
         for e in archive_data.directory_ls(rev_data["directory"])
         if e["type"] == "file"
     ]
     dir_entry = random.choice(dir_entries)
 
     assert archive.lookup_directory_through_revision(
         {"sha1_git": revision}, dir_entry["name"]
     ) == (revision, archive.lookup_directory_with_revision(revision, dir_entry["name"]))
 
 
 def test_lookup_directory_through_revision_ok_with_data(archive_data, revision):
     rev_data = archive_data.revision_get(revision)
     dir_entries = [
         e
         for e in archive_data.directory_ls(rev_data["directory"])
         if e["type"] == "file"
     ]
     dir_entry = random.choice(dir_entries)
 
     assert archive.lookup_directory_through_revision(
         {"sha1_git": revision}, dir_entry["name"], with_data=True
     ) == (
         revision,
         archive.lookup_directory_with_revision(
             revision, dir_entry["name"], with_data=True
         ),
     )
 
 
 def test_lookup_known_objects(
     archive_data, content, directory, release, revision, snapshot
 ):
     expected = archive_data.content_find(content)
     assert archive.lookup_object(ObjectType.CONTENT, content["sha1_git"]) == expected
 
     expected = archive_data.directory_get(directory)
     assert archive.lookup_object(ObjectType.DIRECTORY, directory) == expected
 
     expected = archive_data.release_get(release)
     assert archive.lookup_object(ObjectType.RELEASE, release) == expected
 
     expected = archive_data.revision_get(revision)
     assert archive.lookup_object(ObjectType.REVISION, revision) == expected
 
     expected = {**archive_data.snapshot_get(snapshot), "next_branch": None}
     assert archive.lookup_object(ObjectType.SNAPSHOT, snapshot) == expected
 
 
-@given(
-    unknown_content(),
-    unknown_directory(),
-    unknown_release(),
-    unknown_revision(),
-    unknown_snapshot(),
-)
 def test_lookup_unknown_objects(
     unknown_content,
     unknown_directory,
     unknown_release,
     unknown_revision,
     unknown_snapshot,
 ):
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_object(ObjectType.CONTENT, unknown_content["sha1_git"])
     assert e.match(r"Content.*not found")
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_object(ObjectType.DIRECTORY, unknown_directory)
     assert e.match(r"Directory.*not found")
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_object(ObjectType.RELEASE, unknown_release)
     assert e.match(r"Release.*not found")
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_object(ObjectType.REVISION, unknown_revision)
     assert e.match(r"Revision.*not found")
 
     with pytest.raises(NotFoundExc) as e:
         archive.lookup_object(ObjectType.SNAPSHOT, unknown_snapshot)
     assert e.match(r"Snapshot.*not found")
 
 
-@given(invalid_sha1())
 def test_lookup_invalid_objects(invalid_sha1):
 
     with pytest.raises(BadInputExc) as e:
         archive.lookup_object(ObjectType.CONTENT, invalid_sha1)
     assert e.match("Invalid hash")
 
     with pytest.raises(BadInputExc) as e:
         archive.lookup_object(ObjectType.DIRECTORY, invalid_sha1)
     assert e.match("Invalid checksum")
 
     with pytest.raises(BadInputExc) as e:
         archive.lookup_object(ObjectType.RELEASE, invalid_sha1)
     assert e.match("Invalid checksum")
 
     with pytest.raises(BadInputExc) as e:
         archive.lookup_object(ObjectType.REVISION, invalid_sha1)
     assert e.match("Invalid checksum")
 
     with pytest.raises(BadInputExc) as e:
         archive.lookup_object(ObjectType.SNAPSHOT, invalid_sha1)
     assert e.match("Invalid checksum")
 
 
 def test_lookup_missing_hashes_non_present():
     missing_cnt = random_sha1()
     missing_dir = random_sha1()
     missing_rev = random_sha1()
     missing_rel = random_sha1()
     missing_snp = random_sha1()
 
     grouped_swhids = {
         ObjectType.CONTENT: [hash_to_bytes(missing_cnt)],
         ObjectType.DIRECTORY: [hash_to_bytes(missing_dir)],
         ObjectType.REVISION: [hash_to_bytes(missing_rev)],
         ObjectType.RELEASE: [hash_to_bytes(missing_rel)],
         ObjectType.SNAPSHOT: [hash_to_bytes(missing_snp)],
     }
 
     actual_result = archive.lookup_missing_hashes(grouped_swhids)
 
     assert actual_result == {
         missing_cnt,
         missing_dir,
         missing_rev,
         missing_rel,
         missing_snp,
     }
 
 
 def test_lookup_missing_hashes_some_present(content, directory):
     missing_rev = random_sha1()
     missing_rel = random_sha1()
     missing_snp = random_sha1()
 
     grouped_swhids = {
         ObjectType.CONTENT: [hash_to_bytes(content["sha1_git"])],
         ObjectType.DIRECTORY: [hash_to_bytes(directory)],
         ObjectType.REVISION: [hash_to_bytes(missing_rev)],
         ObjectType.RELEASE: [hash_to_bytes(missing_rel)],
         ObjectType.SNAPSHOT: [hash_to_bytes(missing_snp)],
     }
 
     actual_result = archive.lookup_missing_hashes(grouped_swhids)
 
     assert actual_result == {missing_rev, missing_rel, missing_snp}
 
 
 def test_lookup_origin_extra_trailing_slash(origin):
     origin_info = archive.lookup_origin({"url": f"{origin['url']}/"})
     assert origin_info["url"] == origin["url"]
 
 
 def test_lookup_origin_missing_trailing_slash(archive_data):
     deb_origin = Origin(url="http://snapshot.debian.org/package/r-base/")
     archive_data.origin_add([deb_origin])
     origin_info = archive.lookup_origin({"url": deb_origin.url[:-1]})
     assert origin_info["url"] == deb_origin.url
 
 
 def test_lookup_origin_single_slash_after_protocol(archive_data):
     origin_url = "http://snapshot.debian.org/package/r-base/"
     malformed_origin_url = "http:/snapshot.debian.org/package/r-base/"
     archive_data.origin_add([Origin(url=origin_url)])
     origin_info = archive.lookup_origin({"url": malformed_origin_url})
     assert origin_info["url"] == origin_url
 
 
 @given(new_origin())
 def test_lookup_origins_get_by_sha1s(origin, unknown_origin):
     hasher = hashlib.sha1()
     hasher.update(origin["url"].encode("utf-8"))
     origin_info = OriginInfo(url=origin["url"])
     origin_sha1 = hasher.hexdigest()
 
     hasher = hashlib.sha1()
     hasher.update(unknown_origin.url.encode("utf-8"))
     unknown_origin_sha1 = hasher.hexdigest()
 
     origins = list(archive.lookup_origins_by_sha1s([origin_sha1]))
     assert origins == [origin_info]
 
     origins = list(archive.lookup_origins_by_sha1s([origin_sha1, origin_sha1]))
     assert origins == [origin_info, origin_info]
 
     origins = list(archive.lookup_origins_by_sha1s([origin_sha1, unknown_origin_sha1]))
     assert origins == [origin_info, None]
 
 
 def test_search_origin(origin):
     results = archive.search_origin(url_pattern=origin["url"])[0]
     assert results == [{"url": origin["url"]}]
 
 
 def test_search_origin_use_ql(mocker, origin):
 
     ORIGIN = [{"url": origin["url"]}]
 
     mock_archive_search = mocker.patch("swh.web.common.archive.search")
     mock_archive_search.origin_search.return_value = PagedResult(
         results=ORIGIN, next_page_token=None,
     )
 
     query = f"origin = '{origin['url']}'"
 
     results = archive.search_origin(url_pattern=query, use_ql=True)[0]
     assert results == ORIGIN
 
     mock_archive_search.origin_search.assert_called_with(
         query=query, page_token=None, with_visit=False, visit_types=None, limit=50
     )
 
 
 def test_lookup_snapshot_sizes(archive_data, snapshot):
     branches = archive_data.snapshot_get(snapshot)["branches"]
 
     expected_sizes = {
         "alias": 0,
         "release": 0,
         "revision": 0,
     }
 
     for branch_name, branch_info in branches.items():
         if branch_info is not None:
             expected_sizes[branch_info["target_type"]] += 1
 
     assert archive.lookup_snapshot_sizes(snapshot) == expected_sizes
 
 
 def test_lookup_snapshot_sizes_with_filtering(archive_data, revision):
     rev_id = hash_to_bytes(revision)
     snapshot = Snapshot(
         branches={
             b"refs/heads/master": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
             b"refs/heads/incoming": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
             b"refs/pull/1": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
             b"refs/pull/2": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
         },
     )
     archive_data.snapshot_add([snapshot])
 
     expected_sizes = {"alias": 0, "release": 0, "revision": 2}
 
     assert (
         archive.lookup_snapshot_sizes(
             snapshot.id.hex(), branch_name_exclude_prefix="refs/pull/"
         )
         == expected_sizes
     )
 
 
 def test_lookup_snapshot_alias(snapshot):
     resolved_alias = archive.lookup_snapshot_alias(snapshot, "HEAD")
     assert resolved_alias is not None
     assert resolved_alias["target_type"] == "revision"
     assert resolved_alias["target"] is not None
 
 
 def test_lookup_snapshot_missing(revision):
     with pytest.raises(NotFoundExc):
         archive.lookup_snapshot(revision)
 
 
 def test_lookup_snapshot_empty_branch_list(archive_data, revision):
     rev_id = hash_to_bytes(revision)
     snapshot = Snapshot(
         branches={
             b"refs/heads/master": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
         },
     )
     archive_data.snapshot_add([snapshot])
 
     # FIXME; This test will change once the inconsistency in storage is fixed
     # postgres backend returns None in case of a missing branch whereas the
     # in-memory implementation (used in tests) returns a data structure;
     # hence the inconsistency
     branches = archive.lookup_snapshot(
         hash_to_hex(snapshot.id), branch_name_include_substring="non-existing",
     )["branches"]
     assert not branches
 
 
 def test_lookup_snapshot_branch_names_filtering(archive_data, revision):
     rev_id = hash_to_bytes(revision)
     snapshot = Snapshot(
         branches={
             b"refs/heads/master": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
             b"refs/heads/incoming": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
             b"refs/pull/1": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
             b"refs/pull/2": SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
             "non_ascii_name_é".encode(): SnapshotBranch(
                 target=rev_id, target_type=TargetType.REVISION,
             ),
         },
     )
     archive_data.snapshot_add([snapshot])
 
     for include_pattern, exclude_prefix, nb_results in (
         ("pull", None, 2),
         ("incoming", None, 1),
         ("é", None, 1),
         (None, "refs/heads/", 3),
         ("refs", "refs/heads/master", 3),
     ):
 
         branches = archive.lookup_snapshot(
             hash_to_hex(snapshot.id),
             branch_name_include_substring=include_pattern,
             branch_name_exclude_prefix=exclude_prefix,
         )["branches"]
         assert len(branches) == nb_results
         for branch_name in branches:
             if include_pattern:
                 assert include_pattern in branch_name
             if exclude_prefix:
                 assert not branch_name.startswith(exclude_prefix)
 
 
 def test_lookup_snapshot_branch_names_filtering_paginated(
     archive_data, directory, revision
 ):
     pattern = "foo"
     nb_branches_by_target_type = 10
     branches = {}
     for i in range(nb_branches_by_target_type):
         branches[f"branch/directory/bar{i}".encode()] = SnapshotBranch(
             target=hash_to_bytes(directory), target_type=TargetType.DIRECTORY,
         )
         branches[f"branch/revision/bar{i}".encode()] = SnapshotBranch(
             target=hash_to_bytes(revision), target_type=TargetType.REVISION,
         )
         branches[f"branch/directory/{pattern}{i}".encode()] = SnapshotBranch(
             target=hash_to_bytes(directory), target_type=TargetType.DIRECTORY,
         )
         branches[f"branch/revision/{pattern}{i}".encode()] = SnapshotBranch(
             target=hash_to_bytes(revision), target_type=TargetType.REVISION,
         )
 
     snapshot = Snapshot(branches=branches)
     archive_data.snapshot_add([snapshot])
 
     branches_count = nb_branches_by_target_type // 2
 
     for target_type in (
         ObjectType.DIRECTORY.name.lower(),
         ObjectType.REVISION.name.lower(),
     ):
         partial_branches = archive.lookup_snapshot(
             hash_to_hex(snapshot.id),
             target_types=[target_type],
             branches_count=branches_count,
             branch_name_include_substring=pattern,
         )
         branches = partial_branches["branches"]
 
         assert len(branches) == branches_count
         for branch_name, branch_data in branches.items():
             assert pattern in branch_name
             assert branch_data["target_type"] == target_type
         for i in range(branches_count):
             assert f"branch/{target_type}/{pattern}{i}" in branches
         assert (
             partial_branches["next_branch"]
             == f"branch/{target_type}/{pattern}{branches_count}"
         )
 
         partial_branches = archive.lookup_snapshot(
             hash_to_hex(snapshot.id),
             target_types=[target_type],
             branches_from=partial_branches["next_branch"],
             branch_name_include_substring=pattern,
         )
         branches = partial_branches["branches"]
 
         assert len(branches) == branches_count
         for branch_name, branch_data in branches.items():
             assert pattern in branch_name
             assert branch_data["target_type"] == target_type
         for i in range(branches_count, 2 * branches_count):
             assert f"branch/{target_type}/{pattern}{i}" in branches
         assert partial_branches["next_branch"] is None
diff --git a/swh/web/tests/conftest.py b/swh/web/tests/conftest.py
index bd23e65c..fc35d801 100644
--- a/swh/web/tests/conftest.py
+++ b/swh/web/tests/conftest.py
@@ -1,1003 +1,1104 @@
 # Copyright (C) 2018-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from collections import defaultdict
 from datetime import timedelta
 import json
 import os
 import random
 import shutil
 from subprocess import PIPE, run
 import sys
 from typing import Any, Dict, List, Optional
 
 from _pytest.python import Function
 from hypothesis import HealthCheck, settings
 import pytest
 
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test.utils import setup_databases  # type: ignore
 from rest_framework.test import APIClient, APIRequestFactory
 
 from swh.model.hashutil import (
     ALGORITHMS,
     DEFAULT_ALGORITHMS,
     hash_to_bytes,
     hash_to_hex,
 )
 from swh.model.model import Content, Directory
 from swh.model.swhids import ObjectType
 from swh.scheduler.tests.common import TASK_TYPES
 from swh.storage.algos.origin import origin_get_latest_visit_status
 from swh.storage.algos.revisions_walker import get_revisions_walker
 from swh.storage.algos.snapshot import snapshot_get_all_branches, snapshot_get_latest
 from swh.web.auth.utils import OIDC_SWH_WEB_CLIENT_ID
 from swh.web.common import converters
 from swh.web.common.origin_save import get_scheduler_load_task_types
 from swh.web.common.typing import OriginVisitInfo
 from swh.web.common.utils import browsers_supported_image_mimes
 from swh.web.config import get_config
-from swh.web.tests.data import get_tests_data, override_storages
+from swh.web.tests.data import (
+    get_tests_data,
+    override_storages,
+    random_content,
+    random_sha1,
+    random_sha256,
+)
 
 # Used to skip some tests
 ctags_json_missing = (
     shutil.which("ctags") is None
     or b"+json" not in run(["ctags", "--version"], stdout=PIPE).stdout
 )
 
 fossology_missing = shutil.which("nomossa") is None
 
 # Register some hypothesis profiles
 settings.register_profile("default", settings())
 
 # we use getattr here to keep mypy happy regardless hypothesis version
 function_scoped_fixture_check = (
     [getattr(HealthCheck, "function_scoped_fixture")]
     if hasattr(HealthCheck, "function_scoped_fixture")
     else []
 )
 
 suppress_health_check = [
     HealthCheck.too_slow,
     HealthCheck.filter_too_much,
 ] + function_scoped_fixture_check
 
 
 settings.register_profile(
     "swh-web", settings(deadline=None, suppress_health_check=suppress_health_check,),
 )
 
 settings.register_profile(
     "swh-web-fast",
     settings(
         deadline=None, max_examples=5, suppress_health_check=suppress_health_check,
     ),
 )
 
 
 def pytest_configure(config):
     # Use fast hypothesis profile by default if none has been
     # explicitly specified in pytest option
     if config.getoption("--hypothesis-profile") is None:
         settings.load_profile("swh-web-fast")
 
     # Small hack in order to be able to run the unit tests
     # without static assets generated by webpack.
     # Those assets are not really needed for the Python tests
     # but the django templates will fail to load due to missing
     # generated file webpack-stats.json describing the js and css
     # files to include.
     # So generate a dummy webpack-stats.json file to overcome
     # that issue.
     test_dir = os.path.dirname(__file__)
     # location of the static folder when running tests through tox
     data_dir = os.path.join(sys.prefix, "share/swh/web")
     static_dir = os.path.join(data_dir, "static")
 
     if not os.path.exists(static_dir):
         # location of the static folder when running tests locally with pytest
         static_dir = os.path.join(test_dir, "../../../static")
 
     webpack_stats = os.path.join(static_dir, "webpack-stats.json")
     if os.path.exists(webpack_stats):
         return
 
     bundles_dir = os.path.join(test_dir, "../../../assets/src/bundles")
     if not os.path.exists(bundles_dir):
         # location of the bundles folder when running tests with tox
         bundles_dir = os.path.join(data_dir, "assets/src/bundles")
 
     _, bundles, _ = next(os.walk(bundles_dir))
 
     mock_webpack_stats = {
         "status": "done",
         "publicPath": "/static",
         "chunks": {},
         "assets": {},
     }
     for bundle in bundles:
         asset = f"js/{bundle}.js"
         mock_webpack_stats["chunks"][bundle] = [asset]
         mock_webpack_stats["assets"][asset] = {
             "name": asset,
             "publicPath": f"/static/{asset}",
         }
 
     with open(webpack_stats, "w") as outfile:
         json.dump(mock_webpack_stats, outfile)
 
 
 # Clear Django cache before each test
 @pytest.fixture(autouse=True)
 def django_cache_cleared():
     cache.clear()
 
 
 # Alias rf fixture from pytest-django
 @pytest.fixture
 def request_factory(rf):
     return rf
 
 
 # Fixture to get test client from Django REST Framework
 @pytest.fixture
 def api_client():
     return APIClient()
 
 
 # Fixture to get API request factory from Django REST Framework
 @pytest.fixture
 def api_request_factory():
     return APIRequestFactory()
 
 
 # Initialize tests data
 @pytest.fixture(scope="function", autouse=True)
 def tests_data():
     data = get_tests_data(reset=True)
     # Update swh-web configuration to use the in-memory storages
     # instantiated in the tests.data module
     override_storages(
         data["storage"], data["idx_storage"], data["search"], data["counters"]
     )
     return data
 
 
+@pytest.fixture(scope="function")
+def sha1():
+    """Fixture returning a valid hexadecimal sha1 value.
+    """
+    return random_sha1()
+
+
+@pytest.fixture(scope="function")
+def invalid_sha1():
+    """Fixture returning an invalid sha1 representation.
+    """
+    return hash_to_hex(bytes(random.randint(0, 255) for _ in range(50)))
+
+
+@pytest.fixture(scope="function")
+def sha256():
+    """Fixture returning a valid hexadecimal sha256 value.
+    """
+    return random_sha256()
+
+
 def _known_swh_objects(tests_data, object_type):
     return tests_data[object_type]
 
 
 @pytest.fixture(scope="function")
 def content(tests_data):
     """Fixture returning a random content ingested into the test archive.
     """
     return random.choice(_known_swh_objects(tests_data, "contents"))
 
 
 @pytest.fixture(scope="function")
 def contents(tests_data):
     """Fixture returning random contents ingested into the test archive.
     """
     return random.choices(
         _known_swh_objects(tests_data, "contents"), k=random.randint(2, 8)
     )
 
 
+def _new_content(tests_data):
+    while True:
+        new_content = random_content()
+        sha1_bytes = hash_to_bytes(new_content["sha1"])
+        if tests_data["storage"].content_get_data(sha1_bytes) is None:
+            return new_content
+
+
+@pytest.fixture(scope="function")
+def unknown_content(tests_data):
+    """Fixture returning a random content not ingested into the test archive.
+    """
+    return _new_content(tests_data)
+
+
+@pytest.fixture(scope="function")
+def unknown_contents(tests_data):
+    """Fixture returning random contents not ingested into the test archive.
+    """
+    new_contents = []
+    new_content_ids = set()
+    nb_contents = random.randint(2, 8)
+    while len(new_contents) != nb_contents:
+        new_content = _new_content(tests_data)
+        if new_content["sha1"] not in new_content_ids:
+            new_contents.append(new_content)
+            new_content_ids.add(new_content["sha1"])
+    return list(new_contents)
+
+
 @pytest.fixture(scope="function")
 def empty_content():
     """Fixture returning the empty content ingested into the test archive.
     """
     empty_content = Content.from_data(data=b"").to_dict()
     for algo in DEFAULT_ALGORITHMS:
         empty_content[algo] = hash_to_hex(empty_content[algo])
     return empty_content
 
 
 @pytest.fixture(scope="function")
 def content_text(tests_data):
     """
     Fixture returning a random textual content ingested into the test archive.
     """
     return random.choice(
         list(
             filter(
                 lambda c: c["mimetype"].startswith("text/"),
                 _known_swh_objects(tests_data, "contents"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def content_text_non_utf8(tests_data):
     """Fixture returning a random textual content not encoded to UTF-8 ingested
     into the test archive.
     """
     return random.choice(
         list(
             filter(
                 lambda c: c["mimetype"].startswith("text/")
                 and c["encoding"] not in ("utf-8", "us-ascii"),
                 _known_swh_objects(tests_data, "contents"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def content_application_no_highlight(tests_data):
     """Fixture returning a random textual content with mimetype
     starting with application/ and no detected programming language to
     highlight ingested into the test archive.
     """
     return random.choice(
         list(
             filter(
                 lambda c: c["mimetype"].startswith("application/")
                 and c["encoding"] != "binary"
                 and c["hljs_language"] == "nohighlight",
                 _known_swh_objects(tests_data, "contents"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def content_text_no_highlight(tests_data):
     """Fixture returning a random textual content with no detected
     programming language to highlight ingested into the test archive.
     """
     return random.choice(
         list(
             filter(
                 lambda c: c["mimetype"].startswith("text/")
                 and c["hljs_language"] == "nohighlight",
                 _known_swh_objects(tests_data, "contents"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def content_image_type(tests_data):
     """Fixture returning a random image content ingested into the test archive.
     """
     return random.choice(
         list(
             filter(
                 lambda c: c["mimetype"] in browsers_supported_image_mimes,
                 _known_swh_objects(tests_data, "contents"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def content_unsupported_image_type_rendering(tests_data):
     """Fixture returning a random image content ingested into the test archive that
     can not be rendered by browsers.
     """
     return random.choice(
         list(
             filter(
                 lambda c: c["mimetype"].startswith("image/")
                 and c["mimetype"] not in browsers_supported_image_mimes,
                 _known_swh_objects(tests_data, "contents"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def content_utf8_detected_as_binary(tests_data):
     """Fixture returning a random textual content detected as binary
     by libmagic while they are valid UTF-8 encoded files.
     """
 
     def utf8_binary_detected(content):
         if content["encoding"] != "binary":
             return False
         try:
             content["raw_data"].decode("utf-8")
         except Exception:
             return False
         else:
             return True
 
     return random.choice(
         list(filter(utf8_binary_detected, _known_swh_objects(tests_data, "contents")))
     )
 
 
 @pytest.fixture(scope="function")
 def contents_with_ctags():
     """
     Fixture returning contents ingested into the test archive.
     Those contents are ctags compatible, that is running ctags on those lay results.
     """
     return {
         "sha1s": [
             "0ab37c02043ebff946c1937523f60aadd0844351",
             "15554cf7608dde6bfefac7e3d525596343a85b6f",
             "2ce837f1489bdfb8faf3ebcc7e72421b5bea83bd",
             "30acd0b47fc25e159e27a980102ddb1c4bea0b95",
             "4f81f05aaea3efb981f9d90144f746d6b682285b",
             "5153aa4b6e4455a62525bc4de38ed0ff6e7dd682",
             "59d08bafa6a749110dfb65ba43a61963d5a5bf9f",
             "7568285b2d7f31ae483ae71617bd3db873deaa2c",
             "7ed3ee8e94ac52ba983dd7690bdc9ab7618247b4",
             "8ed7ef2e7ff9ed845e10259d08e4145f1b3b5b03",
             "9b3557f1ab4111c8607a4f2ea3c1e53c6992916c",
             "9c20da07ed14dc4fcd3ca2b055af99b2598d8bdd",
             "c20ceebd6ec6f7a19b5c3aebc512a12fbdc9234b",
             "e89e55a12def4cd54d5bff58378a3b5119878eb7",
             "e8c0654fe2d75ecd7e0b01bee8a8fc60a130097e",
             "eb6595e559a1d34a2b41e8d4835e0e4f98a5d2b5",
         ],
         "symbol_name": "ABS",
     }
 
 
 @pytest.fixture(scope="function")
 def directory(tests_data):
     """Fixture returning a random directory ingested into the test archive.
     """
     return random.choice(_known_swh_objects(tests_data, "directories"))
 
 
 def _directory_with_entry_type(tests_data, type_):
     return random.choice(
         list(
             filter(
                 lambda d: any(
                     [
                         e["type"] == type_
                         for e in list(
                             tests_data["storage"].directory_ls(hash_to_bytes(d))
                         )
                     ]
                 ),
                 _known_swh_objects(tests_data, "directories"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def directory_with_subdirs(tests_data):
     """Fixture returning a random directory containing sub directories ingested
     into the test archive.
     """
     return _directory_with_entry_type(tests_data, "dir")
 
 
 @pytest.fixture(scope="function")
 def directory_with_files(tests_data):
     """Fixture returning a random directory containing at least one regular file.
     """
     return _directory_with_entry_type(tests_data, "file")
 
 
+@pytest.fixture(scope="function")
+def unknown_directory(tests_data):
+    """Fixture returning a random directory not ingested into the test archive.
+    """
+    while True:
+        new_directory = random_sha1()
+        sha1_bytes = hash_to_bytes(new_directory)
+        if list(tests_data["storage"].directory_missing([sha1_bytes])):
+            return new_directory
+
+
 @pytest.fixture(scope="function")
 def empty_directory():
     """Fixture returning the empty directory ingested into the test archive.
     """
     return Directory(entries=()).id.hex()
 
 
 @pytest.fixture(scope="function")
 def revision(tests_data):
     """Fixturereturning a random revision ingested into the test archive.
     """
     return random.choice(_known_swh_objects(tests_data, "revisions"))
 
 
 @pytest.fixture(scope="function")
 def revisions(tests_data):
     """Fixture returning random revisions ingested into the test archive.
     """
     return random.choices(
         _known_swh_objects(tests_data, "revisions"), k=random.randint(2, 8),
     )
 
 
 @pytest.fixture(scope="function")
 def revisions_list(tests_data):
     """Fixture returning random revisions ingested into the test archive.
     """
 
     def gen_revisions_list(size):
         return random.choices(_known_swh_objects(tests_data, "revisions"), k=size,)
 
     return gen_revisions_list
 
 
+@pytest.fixture(scope="function")
+def unknown_revision(tests_data):
+    """Fixture returning a random revision not ingested into the test archive.
+    """
+    while True:
+        new_revision = random_sha1()
+        sha1_bytes = hash_to_bytes(new_revision)
+        if tests_data["storage"].revision_get([sha1_bytes])[0] is None:
+            return new_revision
+
+
 def _get_origin_dfs_revisions_walker(tests_data):
     storage = tests_data["storage"]
     origin = random.choice(tests_data["origins"][:-1])
     snapshot = snapshot_get_latest(storage, origin["url"])
     if snapshot.branches[b"HEAD"].target_type.value == "alias":
         target = snapshot.branches[b"HEAD"].target
         head = snapshot.branches[target].target
     else:
         head = snapshot.branches[b"HEAD"].target
     return get_revisions_walker("dfs", storage, head)
 
 
 @pytest.fixture(scope="function")
 def ancestor_revisions(tests_data):
     """Fixture returning a pair of revisions ingested into the test archive
     with an ancestor relation.
     """
     # get a dfs revisions walker for one of the origins
     # loaded into the test archive
     revisions_walker = _get_origin_dfs_revisions_walker(tests_data)
     master_revisions = []
     children = defaultdict(list)
     init_rev_found = False
     # get revisions only authored in the master branch
     for rev in revisions_walker:
         for rev_p in rev["parents"]:
             children[rev_p].append(rev["id"])
         if not init_rev_found:
             master_revisions.append(rev)
         if not rev["parents"]:
             init_rev_found = True
 
     # head revision
     root_rev = master_revisions[0]
     # pick a random revision, different from head, only authored
     # in the master branch
     ancestor_rev_idx = random.choice(list(range(1, len(master_revisions) - 1)))
     ancestor_rev = master_revisions[ancestor_rev_idx]
     ancestor_child_revs = children[ancestor_rev["id"]]
 
     return {
         "sha1_git_root": hash_to_hex(root_rev["id"]),
         "sha1_git": hash_to_hex(ancestor_rev["id"]),
         "children": [hash_to_hex(r) for r in ancestor_child_revs],
     }
 
 
 @pytest.fixture(scope="function")
 def non_ancestor_revisions(tests_data):
     """Fixture returning a pair of revisions ingested into the test archive
     with no ancestor relation.
     """
     # get a dfs revisions walker for one of the origins
     # loaded into the test archive
     revisions_walker = _get_origin_dfs_revisions_walker(tests_data)
     merge_revs = []
     children = defaultdict(list)
     # get all merge revisions
     for rev in revisions_walker:
         if len(rev["parents"]) > 1:
             merge_revs.append(rev)
         for rev_p in rev["parents"]:
             children[rev_p].append(rev["id"])
     # find a merge revisions whose parents have a unique child revision
     random.shuffle(merge_revs)
     selected_revs = None
     for merge_rev in merge_revs:
         if all(len(children[rev_p]) == 1 for rev_p in merge_rev["parents"]):
             selected_revs = merge_rev["parents"]
 
     return {
         "sha1_git_root": hash_to_hex(selected_revs[0]),
         "sha1_git": hash_to_hex(selected_revs[1]),
     }
 
 
 @pytest.fixture(scope="function")
 def revision_with_submodules():
     """Fixture returning a revision that is known to
     point to a directory with revision entries (aka git submodules)
     """
 
     return {
         "rev_sha1_git": "ffcb69001f3f6745dfd5b48f72ab6addb560e234",
         "rev_dir_sha1_git": "d92a21446387fa28410e5a74379c934298f39ae2",
         "rev_dir_rev_path": "libtess2",
     }
 
 
 @pytest.fixture(scope="function")
 def release(tests_data):
     """Fixture returning a random release ingested into the test archive.
     """
     return random.choice(_known_swh_objects(tests_data, "releases"))
 
 
 @pytest.fixture(scope="function")
 def releases(tests_data):
     """Fixture returning random releases ingested into the test archive.
     """
     return random.choices(
         _known_swh_objects(tests_data, "releases"), k=random.randint(2, 8)
     )
 
 
+@pytest.fixture(scope="function")
+def unknown_release(tests_data):
+    """Fixture returning a random release not ingested into the test archive.
+    """
+    while True:
+        new_release = random_sha1()
+        sha1_bytes = hash_to_bytes(new_release)
+        if tests_data["storage"].release_get([sha1_bytes])[0] is None:
+            return new_release
+
+
 @pytest.fixture(scope="function")
 def snapshot(tests_data):
     """Fixture returning a random snapshot ingested into the test archive.
     """
     return random.choice(_known_swh_objects(tests_data, "snapshots"))
 
 
+@pytest.fixture(scope="function")
+def unknown_snapshot(tests_data):
+    """Fixture returning a random snapshot not ingested into the test archive.
+    """
+    while True:
+        new_snapshot = random_sha1()
+        sha1_bytes = hash_to_bytes(new_snapshot)
+        if tests_data["storage"].snapshot_get_branches(sha1_bytes) is None:
+            return new_snapshot
+
+
 @pytest.fixture(scope="function")
 def origin(tests_data):
     """Fixture returning a random origin ingested into the test archive.
     """
     return random.choice(_known_swh_objects(tests_data, "origins"))
 
 
 @pytest.fixture(scope="function")
 def origin_with_multiple_visits(tests_data):
     """Fixture returning a random origin with multiple visits ingested
     into the test archive.
     """
     origins = []
     storage = tests_data["storage"]
     for origin in tests_data["origins"]:
         visit_page = storage.origin_visit_get(origin["url"])
         if len(visit_page.results) > 1:
             origins.append(origin)
     return random.choice(origins)
 
 
 @pytest.fixture(scope="function")
 def origin_with_releases(tests_data):
     """Fixture returning a random origin with releases ingested into the test archive.
     """
     origins = []
     for origin in tests_data["origins"]:
         snapshot = snapshot_get_latest(tests_data["storage"], origin["url"])
         if any([b.target_type.value == "release" for b in snapshot.branches.values()]):
             origins.append(origin)
     return random.choice(origins)
 
 
 @pytest.fixture(scope="function")
 def origin_with_pull_request_branches(tests_data):
     """Fixture returning a random origin with pull request branches ingested
     into the test archive.
     """
     origins = []
     storage = tests_data["storage"]
     for origin in storage.origin_list(limit=1000).results:
         snapshot = snapshot_get_latest(storage, origin.url)
         if any([b"refs/pull/" in b for b in snapshot.branches]):
             origins.append(origin)
     return random.choice(origins)
 
 
 def _object_type_swhid(tests_data, object_type):
     return random.choice(
         list(
             filter(
                 lambda swhid: swhid.object_type == object_type,
                 _known_swh_objects(tests_data, "swhids"),
             )
         )
     )
 
 
 @pytest.fixture(scope="function")
 def content_swhid(tests_data):
     """Fixture returning a qualified SWHID for a random content object
     ingested into the test archive.
     """
     return _object_type_swhid(tests_data, ObjectType.CONTENT)
 
 
 @pytest.fixture(scope="function")
 def directory_swhid(tests_data):
     """Fixture returning a qualified SWHID for a random directory object
     ingested into the test archive.
     """
     return _object_type_swhid(tests_data, ObjectType.DIRECTORY)
 
 
 @pytest.fixture(scope="function")
 def release_swhid(tests_data):
     """Fixture returning a qualified SWHID for a random release object
     ingested into the test archive.
     """
     return _object_type_swhid(tests_data, ObjectType.RELEASE)
 
 
 @pytest.fixture(scope="function")
 def revision_swhid(tests_data):
     """Fixture returning a qualified SWHID for a random revision object
     ingested into the test archive.
     """
     return _object_type_swhid(tests_data, ObjectType.REVISION)
 
 
 @pytest.fixture(scope="function")
 def snapshot_swhid(tests_data):
     """Fixture returning a qualified SWHID for a snapshot object
     ingested into the test archive.
     """
     return _object_type_swhid(tests_data, ObjectType.SNAPSHOT)
 
 
 # Fixture to manipulate data from a sample archive used in the tests
 @pytest.fixture(scope="function")
 def archive_data(tests_data):
     return _ArchiveData(tests_data)
 
 
 # Fixture to manipulate indexer data from a sample archive used in the tests
 @pytest.fixture(scope="function")
 def indexer_data(tests_data):
     return _IndexerData(tests_data)
 
 
 # Custom data directory for requests_mock
 @pytest.fixture
 def datadir():
     return os.path.join(os.path.abspath(os.path.dirname(__file__)), "resources")
 
 
 class _ArchiveData:
     """
     Helper class to manage data from a sample test archive.
 
     It is initialized with a reference to an in-memory storage
     containing raw tests data.
 
     It is basically a proxy to Storage interface but it overrides some methods
     to retrieve those tests data in a json serializable format in order to ease
     tests implementation.
     """
 
     def __init__(self, tests_data):
         self.storage = tests_data["storage"]
 
     def __getattr__(self, key):
         if key == "storage":
             raise AttributeError(key)
         # Forward calls to non overridden Storage methods to wrapped
         # storage instance
         return getattr(self.storage, key)
 
     def content_find(self, content: Dict[str, Any]) -> Dict[str, Any]:
         cnt_ids_bytes = {
             algo_hash: hash_to_bytes(content[algo_hash])
             for algo_hash in ALGORITHMS
             if content.get(algo_hash)
         }
         cnt = self.storage.content_find(cnt_ids_bytes)
         return converters.from_content(cnt[0].to_dict()) if cnt else cnt
 
     def content_get(self, cnt_id: str) -> Dict[str, Any]:
         cnt_id_bytes = hash_to_bytes(cnt_id)
         content = self.storage.content_get([cnt_id_bytes])[0]
         if content:
             content_d = content.to_dict()
             content_d.pop("ctime", None)
         else:
             content_d = None
         return converters.from_swh(
             content_d, hashess={"sha1", "sha1_git", "sha256", "blake2s256"}
         )
 
     def content_get_data(self, cnt_id: str) -> Optional[Dict[str, Any]]:
         cnt_id_bytes = hash_to_bytes(cnt_id)
         cnt_data = self.storage.content_get_data(cnt_id_bytes)
         if cnt_data is None:
             return None
         return converters.from_content({"data": cnt_data, "sha1": cnt_id_bytes})
 
     def directory_get(self, dir_id):
         return {"id": dir_id, "content": self.directory_ls(dir_id)}
 
     def directory_ls(self, dir_id):
         cnt_id_bytes = hash_to_bytes(dir_id)
         dir_content = map(
             converters.from_directory_entry, self.storage.directory_ls(cnt_id_bytes)
         )
         return list(dir_content)
 
     def release_get(self, rel_id: str) -> Optional[Dict[str, Any]]:
         rel_id_bytes = hash_to_bytes(rel_id)
         rel_data = self.storage.release_get([rel_id_bytes])[0]
         return converters.from_release(rel_data) if rel_data else None
 
     def revision_get(self, rev_id: str) -> Optional[Dict[str, Any]]:
         rev_id_bytes = hash_to_bytes(rev_id)
         rev_data = self.storage.revision_get([rev_id_bytes])[0]
         return converters.from_revision(rev_data) if rev_data else None
 
     def revision_log(self, rev_id, limit=None):
         rev_id_bytes = hash_to_bytes(rev_id)
         return list(
             map(
                 converters.from_revision,
                 self.storage.revision_log([rev_id_bytes], limit=limit),
             )
         )
 
     def snapshot_get_latest(self, origin_url):
         snp = snapshot_get_latest(self.storage, origin_url)
         return converters.from_snapshot(snp.to_dict())
 
     def origin_get(self, origin_urls):
         origins = self.storage.origin_get(origin_urls)
         return [converters.from_origin(o.to_dict()) for o in origins]
 
     def origin_visit_get(self, origin_url):
         next_page_token = None
         visits = []
         while True:
             visit_page = self.storage.origin_visit_get(
                 origin_url, page_token=next_page_token
             )
             next_page_token = visit_page.next_page_token
 
             for visit in visit_page.results:
                 visit_status = self.storage.origin_visit_status_get_latest(
                     origin_url, visit.visit
                 )
                 visits.append(
                     converters.from_origin_visit(
                         {**visit_status.to_dict(), "type": visit.type}
                     )
                 )
             if not next_page_token:
                 break
         return visits
 
     def origin_visit_get_by(self, origin_url: str, visit_id: int) -> OriginVisitInfo:
         visit = self.storage.origin_visit_get_by(origin_url, visit_id)
         assert visit is not None
         visit_status = self.storage.origin_visit_status_get_latest(origin_url, visit_id)
         assert visit_status is not None
         return converters.from_origin_visit(
             {**visit_status.to_dict(), "type": visit.type}
         )
 
     def origin_visit_status_get_latest(
         self,
         origin_url,
         type: Optional[str] = None,
         allowed_statuses: Optional[List[str]] = None,
         require_snapshot: bool = False,
     ):
         visit_status = origin_get_latest_visit_status(
             self.storage,
             origin_url,
             type=type,
             allowed_statuses=allowed_statuses,
             require_snapshot=require_snapshot,
         )
         return (
             converters.from_origin_visit(visit_status.to_dict())
             if visit_status
             else None
         )
 
     def snapshot_get(self, snapshot_id):
         snp = snapshot_get_all_branches(self.storage, hash_to_bytes(snapshot_id))
         return converters.from_snapshot(snp.to_dict())
 
     def snapshot_get_branches(
         self, snapshot_id, branches_from="", branches_count=1000, target_types=None
     ):
         partial_branches = self.storage.snapshot_get_branches(
             hash_to_bytes(snapshot_id),
             branches_from.encode(),
             branches_count,
             target_types,
         )
         return converters.from_partial_branches(partial_branches)
 
     def snapshot_get_head(self, snapshot):
         if snapshot["branches"]["HEAD"]["target_type"] == "alias":
             target = snapshot["branches"]["HEAD"]["target"]
             head = snapshot["branches"][target]["target"]
         else:
             head = snapshot["branches"]["HEAD"]["target"]
         return head
 
     def snapshot_count_branches(self, snapshot_id):
         counts = dict.fromkeys(("alias", "release", "revision"), 0)
         counts.update(self.storage.snapshot_count_branches(hash_to_bytes(snapshot_id)))
         counts.pop(None, None)
         return counts
 
 
 class _IndexerData:
     """
     Helper class to manage indexer tests data
 
     It is initialized with a reference to an in-memory indexer storage
     containing raw tests data.
 
     It also defines class methods to retrieve those tests data in
     a json serializable format in order to ease tests implementation.
 
     """
 
     def __init__(self, tests_data):
         self.idx_storage = tests_data["idx_storage"]
         self.mimetype_indexer = tests_data["mimetype_indexer"]
         self.license_indexer = tests_data["license_indexer"]
         self.ctags_indexer = tests_data["ctags_indexer"]
 
     def content_add_mimetype(self, cnt_id):
         self.mimetype_indexer.run([hash_to_bytes(cnt_id)])
 
     def content_get_mimetype(self, cnt_id):
         mimetype = self.idx_storage.content_mimetype_get([hash_to_bytes(cnt_id)])[
             0
         ].to_dict()
         return converters.from_filetype(mimetype)
 
     def content_add_license(self, cnt_id):
         self.license_indexer.run([hash_to_bytes(cnt_id)])
 
     def content_get_license(self, cnt_id):
         cnt_id_bytes = hash_to_bytes(cnt_id)
         licenses = self.idx_storage.content_fossology_license_get([cnt_id_bytes])
         for license in licenses:
             yield converters.from_swh(license.to_dict(), hashess={"id"})
 
     def content_add_ctags(self, cnt_id):
         self.ctags_indexer.run([hash_to_bytes(cnt_id)])
 
     def content_get_ctags(self, cnt_id):
         cnt_id_bytes = hash_to_bytes(cnt_id)
         ctags = self.idx_storage.content_ctags_get([cnt_id_bytes])
         for ctag in ctags:
             yield converters.from_swh(ctag, hashess={"id"})
 
 
 @pytest.fixture
 def keycloak_oidc(keycloak_oidc, mocker):
     keycloak_config = get_config()["keycloak"]
 
     keycloak_oidc.server_url = keycloak_config["server_url"]
     keycloak_oidc.realm_name = keycloak_config["realm_name"]
     keycloak_oidc.client_id = OIDC_SWH_WEB_CLIENT_ID
 
     keycloak_oidc_client = mocker.patch("swh.web.auth.views.keycloak_oidc_client")
     keycloak_oidc_client.return_value = keycloak_oidc
 
     return keycloak_oidc
 
 
 @pytest.fixture
 def subtest(request):
     """A hack to explicitly set up and tear down fixtures.
 
     This fixture allows you to set up and tear down fixtures within the test
     function itself. This is useful (necessary!) for using Hypothesis inside
     pytest, as hypothesis will call the test function multiple times, without
     setting up or tearing down fixture state as it is normally the case.
 
     Copied from the pytest-subtesthack project, public domain license
     (https://github.com/untitaker/pytest-subtesthack).
     """
     parent_test = request.node
 
     def inner(func):
         if hasattr(Function, "from_parent"):
             item = Function.from_parent(
                 parent_test,
                 name=request.function.__name__ + "[]",
                 originalname=request.function.__name__,
                 callobj=func,
             )
         else:
             item = Function(
                 name=request.function.__name__ + "[]", parent=parent_test, callobj=func
             )
         nextitem = parent_test  # prevents pytest from tearing down module fixtures
 
         item.ihook.pytest_runtest_setup(item=item)
         item.ihook.pytest_runtest_call(item=item)
         item.ihook.pytest_runtest_teardown(item=item, nextitem=nextitem)
 
     return inner
 
 
 @pytest.fixture
 def swh_scheduler(swh_scheduler):
     config = get_config()
     scheduler = config["scheduler"]
     config["scheduler"] = swh_scheduler
     # create load-git and load-hg task types
     for task_type in TASK_TYPES.values():
         swh_scheduler.create_task_type(task_type)
     # create load-svn task type
     swh_scheduler.create_task_type(
         {
             "type": "load-svn",
             "description": "Update a Subversion repository",
             "backend_name": "swh.loader.svn.tasks.DumpMountAndLoadSvnRepository",
             "default_interval": timedelta(days=64),
             "min_interval": timedelta(hours=12),
             "max_interval": timedelta(days=64),
             "backoff_factor": 2,
             "max_queue_length": None,
             "num_retries": 7,
             "retry_delay": timedelta(hours=2),
         }
     )
     # create load-cvs task type
     swh_scheduler.create_task_type(
         {
             "type": "load-cvs",
             "description": "Update a CVS repository",
             "backend_name": "swh.loader.cvs.tasks.DumpMountAndLoadSvnRepository",
             "default_interval": timedelta(days=64),
             "min_interval": timedelta(hours=12),
             "max_interval": timedelta(days=64),
             "backoff_factor": 2,
             "max_queue_length": None,
             "num_retries": 7,
             "retry_delay": timedelta(hours=2),
         }
     )
 
     # add method to add load-archive-files task type during tests
     def add_load_archive_task_type():
         swh_scheduler.create_task_type(
             {
                 "type": "load-archive-files",
                 "description": "Load tarballs",
                 "backend_name": "swh.loader.package.archive.tasks.LoadArchive",
                 "default_interval": timedelta(days=64),
                 "min_interval": timedelta(hours=12),
                 "max_interval": timedelta(days=64),
                 "backoff_factor": 2,
                 "max_queue_length": None,
                 "num_retries": 7,
                 "retry_delay": timedelta(hours=2),
             }
         )
 
     swh_scheduler.add_load_archive_task_type = add_load_archive_task_type
 
     yield swh_scheduler
     config["scheduler"] = scheduler
     get_scheduler_load_task_types.cache_clear()
 
 
 @pytest.fixture(scope="session")
 def django_db_setup(request, django_db_blocker, postgresql_proc):
     from django.conf import settings
 
     settings.DATABASES["default"].update(
         {
             ("ENGINE", "django.db.backends.postgresql"),
             ("NAME", get_config()["test_db"]["name"]),
             ("USER", postgresql_proc.user),
             ("HOST", postgresql_proc.host),
             ("PORT", postgresql_proc.port),
         }
     )
     with django_db_blocker.unblock():
         setup_databases(
             verbosity=request.config.option.verbose, interactive=False, keepdb=False
         )
 
 
 @pytest.fixture
 def staff_user():
     return User.objects.create_user(username="admin", password="", is_staff=True)
 
 
 @pytest.fixture
 def regular_user():
     return User.objects.create_user(username="johndoe", password="")
 
 
 @pytest.fixture
 def regular_user2():
     return User.objects.create_user(username="janedoe", password="")
diff --git a/swh/web/tests/misc/test_badges.py b/swh/web/tests/misc/test_badges.py
index 02793d62..c8fc7c02 100644
--- a/swh/web/tests/misc/test_badges.py
+++ b/swh/web/tests/misc/test_badges.py
@@ -1,195 +1,179 @@
 # Copyright (C) 2019-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from corsheaders.middleware import ACCESS_CONTROL_ALLOW_ORIGIN
 from hypothesis import given
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.swhids import ObjectType, QualifiedSWHID
 from swh.web.common import archive
 from swh.web.common.identifiers import resolve_swhid
 from swh.web.common.utils import reverse
 from swh.web.misc.badges import _badge_config, _get_logo_data
 from swh.web.tests.django_asserts import assert_contains
-from swh.web.tests.strategies import (
-    invalid_sha1,
-    new_origin,
-    unknown_content,
-    unknown_directory,
-    unknown_release,
-    unknown_revision,
-    unknown_snapshot,
-)
+from swh.web.tests.strategies import new_origin
 from swh.web.tests.utils import check_http_get_response
 
 
 def test_content_badge(client, content):
     _test_badge_endpoints(client, "content", content["sha1_git"])
 
 
 def test_directory_badge(client, directory):
     _test_badge_endpoints(client, "directory", directory)
 
 
 def test_origin_badge(client, origin):
     _test_badge_endpoints(client, "origin", origin["url"])
 
 
 def test_release_badge(client, release):
     _test_badge_endpoints(client, "release", release)
 
 
 def test_revision_badge(client, revision):
     _test_badge_endpoints(client, "revision", revision)
 
 
 def test_snapshot_badge(client, snapshot):
     _test_badge_endpoints(client, "snapshot", snapshot)
 
 
-@given(
-    unknown_content(),
-    unknown_directory(),
-    new_origin(),
-    unknown_release(),
-    unknown_revision(),
-    unknown_snapshot(),
-    invalid_sha1(),
-)
+@given(new_origin(),)
 def test_badge_errors(
     client,
     unknown_content,
     unknown_directory,
-    new_origin,
     unknown_release,
     unknown_revision,
     unknown_snapshot,
     invalid_sha1,
+    new_origin,
 ):
     for object_type, object_id in (
         ("content", unknown_content["sha1_git"]),
         ("directory", unknown_directory),
         ("origin", new_origin),
         ("release", unknown_release),
         ("revision", unknown_revision),
         ("snapshot", unknown_snapshot),
     ):
         url_args = {"object_type": object_type, "object_id": object_id}
         url = reverse("swh-badge", url_args=url_args)
         resp = check_http_get_response(
             client, url, status_code=200, content_type="image/svg+xml"
         )
         _check_generated_badge(resp, **url_args, error="not found")
 
     for object_type, object_id in (
         (ObjectType.CONTENT, invalid_sha1),
         (ObjectType.DIRECTORY, invalid_sha1),
         (ObjectType.RELEASE, invalid_sha1),
         (ObjectType.REVISION, invalid_sha1),
         (ObjectType.SNAPSHOT, invalid_sha1),
     ):
         url_args = {"object_type": object_type.name.lower(), "object_id": object_id}
         url = reverse("swh-badge", url_args=url_args)
 
         resp = check_http_get_response(
             client, url, status_code=200, content_type="image/svg+xml"
         )
         _check_generated_badge(resp, **url_args, error="invalid id")
 
         object_swhid = f"swh:1:{object_type.value}:{object_id}"
         url = reverse("swh-badge-swhid", url_args={"object_swhid": object_swhid})
         resp = check_http_get_response(
             client, url, status_code=200, content_type="image/svg+xml"
         )
         _check_generated_badge(resp, "", "", error="invalid id")
 
 
 def test_badge_endpoints_have_cors_header(client, origin, release):
     url = reverse(
         "swh-badge", url_args={"object_type": "origin", "object_id": origin["url"]}
     )
 
     resp = check_http_get_response(
         client,
         url,
         status_code=200,
         content_type="image/svg+xml",
         http_origin="https://example.org",
     )
     assert ACCESS_CONTROL_ALLOW_ORIGIN in resp
 
     release_swhid = str(
         QualifiedSWHID(object_type=ObjectType.RELEASE, object_id=hash_to_bytes(release))
     )
     url = reverse("swh-badge-swhid", url_args={"object_swhid": release_swhid})
     resp = check_http_get_response(
         client,
         url,
         status_code=200,
         content_type="image/svg+xml",
         http_origin="https://example.org",
     )
     assert ACCESS_CONTROL_ALLOW_ORIGIN in resp
 
 
 def _test_badge_endpoints(client, object_type: str, object_id: str):
     url_args = {"object_type": object_type, "object_id": object_id}
     url = reverse("swh-badge", url_args=url_args)
     resp = check_http_get_response(
         client, url, status_code=200, content_type="image/svg+xml"
     )
     _check_generated_badge(resp, **url_args)
 
     if object_type != "origin":
         obj_swhid = str(
             QualifiedSWHID(
                 object_type=ObjectType[object_type.upper()],
                 object_id=hash_to_bytes(object_id),
             )
         )
         url = reverse("swh-badge-swhid", url_args={"object_swhid": obj_swhid})
         resp = check_http_get_response(
             client, url, status_code=200, content_type="image/svg+xml"
         )
         _check_generated_badge(resp, **url_args)
 
 
 def _check_generated_badge(response, object_type, object_id, error=None):
     assert response.status_code == 200, response.content
     assert response["Content-Type"] == "image/svg+xml"
 
     if not object_type:
         object_type = "object"
 
     if object_type == "origin" and error is None:
         link = reverse("browse-origin", query_params={"origin_url": object_id})
         text = "repository"
     elif error is None:
         text = str(
             QualifiedSWHID(
                 object_type=ObjectType[object_type.upper()],
                 object_id=hash_to_bytes(object_id),
             )
         )
         link = resolve_swhid(text)["browse_url"]
         if object_type == "release":
             release = archive.lookup_release(object_id)
             text = release["name"]
     elif error == "invalid id":
         text = "error"
         link = f"invalid {object_type} id"
         object_type = "error"
     elif error == "not found":
         text = "error"
         link = f"{object_type} not found"
         object_type = "error"
 
     assert_contains(response, "<svg ")
     assert_contains(response, "</svg>")
     assert_contains(response, _get_logo_data())
     assert_contains(response, _badge_config[object_type]["color"])
     assert_contains(response, _badge_config[object_type]["title"])
     assert_contains(response, text)
     assert_contains(response, link)
diff --git a/swh/web/tests/misc/test_iframe.py b/swh/web/tests/misc/test_iframe.py
index beaf454f..64a764dd 100644
--- a/swh/web/tests/misc/test_iframe.py
+++ b/swh/web/tests/misc/test_iframe.py
@@ -1,72 +1,69 @@
 # Copyright (C) 2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from hypothesis import given
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.swhids import CoreSWHID, ObjectType
 from swh.web.common.utils import reverse
-from swh.web.tests.strategies import unknown_directory
 from swh.web.tests.utils import check_html_get_response
 
 
 def test_content_swhid_iframe(client, content_swhid):
     url = reverse("swhid-iframe", url_args={"swhid": str(content_swhid)})
     check_html_get_response(
         client, url, status_code=200, template_used="misc/iframe.html"
     )
 
 
 def test_content_core_swhid_iframe(client, content_swhid):
     content_core_swhid = CoreSWHID(
         object_type=content_swhid.object_type, object_id=content_swhid.object_id
     )
     url = reverse("swhid-iframe", url_args={"swhid": str(content_core_swhid)})
     check_html_get_response(
         client, url, status_code=200, template_used="misc/iframe.html"
     )
 
 
 def test_directory_swhid_iframe(client, directory_swhid):
     url = reverse("swhid-iframe", url_args={"swhid": str(directory_swhid)})
     check_html_get_response(
         client, url, status_code=200, template_used="misc/iframe.html"
     )
 
 
 def test_directory_core_swhid_iframe(client, directory_swhid):
     directory_core_swhid = CoreSWHID(
         object_type=directory_swhid.object_type, object_id=directory_swhid.object_id
     )
     url = reverse("swhid-iframe", url_args={"swhid": str(directory_core_swhid)})
     check_html_get_response(
         client, url, status_code=200, template_used="misc/iframe.html"
     )
 
 
 def test_iframe_unsupported_object(client, revision_swhid):
     url = reverse("swhid-iframe", url_args={"swhid": str(revision_swhid)})
     check_html_get_response(
         client, url, status_code=400, template_used="misc/iframe.html"
     )
 
 
-@given(unknown_directory())
 def test_iframe_object_not_found(client, unknown_directory):
     swhid = CoreSWHID(
         object_type=ObjectType.DIRECTORY, object_id=hash_to_bytes(unknown_directory)
     )
     url = reverse("swhid-iframe", url_args={"swhid": str(swhid)})
     check_html_get_response(
         client, url, status_code=404, template_used="misc/iframe.html"
     )
 
 
 def test_swhid_iframe_unknown_error(client, mocker, content_swhid):
     mocker.patch("swh.web.misc.iframe.get_swhid").side_effect = Exception("Error")
     url = reverse("swhid-iframe", url_args={"swhid": str(content_swhid)})
     check_html_get_response(
         client, url, status_code=500, template_used="misc/iframe.html"
     )
diff --git a/swh/web/tests/strategies.py b/swh/web/tests/strategies.py
index 2cf82e14..a57a518f 100644
--- a/swh/web/tests/strategies.py
+++ b/swh/web/tests/strategies.py
@@ -1,245 +1,91 @@
 # Copyright (C) 2018-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from datetime import datetime
-import random
 
-from hypothesis import assume, settings
 from hypothesis.extra.dateutil import timezones
-from hypothesis.strategies import binary, characters, composite, datetimes, lists, text
+from hypothesis.strategies import composite, datetimes, lists, text
 
-from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.hypothesis_strategies import origins as new_origin_strategy
+from swh.model.hypothesis_strategies import persons as new_person_strategy
+from swh.model.hypothesis_strategies import sha1_git
 from swh.model.hypothesis_strategies import snapshots as new_snapshot
-from swh.model.model import Person, Revision, RevisionType, TimestampWithTimezone
-from swh.web.tests.data import get_tests_data
+from swh.model.model import Revision, RevisionType, TimestampWithTimezone
 
 # Module dedicated to the generation of input data for tests through
 # the use of hypothesis.
-# Some of these data are sampled from a test archive created and populated
-# in the swh.web.tests.data module.
-
-# Set the swh-web hypothesis profile if none has been explicitly set
-hypothesis_default_settings = settings.get_profile("default")
-if repr(settings()) == repr(hypothesis_default_settings):
-    settings.load_profile("swh-web")
-
-
-def sha1():
-    """
-    Hypothesis strategy returning a valid hexadecimal sha1 value.
-    """
-    return binary(min_size=20, max_size=20).map(hash_to_hex)
-
-
-def invalid_sha1():
-    """
-    Hypothesis strategy returning an invalid sha1 representation.
-    """
-    return binary(min_size=50, max_size=50).map(hash_to_hex)
-
-
-def sha256():
-    """
-    Hypothesis strategy returning a valid hexadecimal sha256 value.
-    """
-    return binary(min_size=32, max_size=32).map(hash_to_hex)
-
-
-@composite
-def new_content(draw):
-    blake2s256_hex = draw(sha256())
-    sha1_hex = draw(sha1())
-    sha1_git_hex = draw(sha1())
-    sha256_hex = draw(sha256())
-
-    assume(sha1_hex != sha1_git_hex)
-    assume(blake2s256_hex != sha256_hex)
-
-    return {
-        "blake2S256": blake2s256_hex,
-        "sha1": sha1_hex,
-        "sha1_git": sha1_git_hex,
-        "sha256": sha256_hex,
-    }
-
-
-def unknown_content():
-    """
-    Hypothesis strategy returning a random content not ingested
-    into the test archive.
-    """
-    return new_content().filter(
-        lambda c: get_tests_data()["storage"].content_get_data(hash_to_bytes(c["sha1"]))
-        is None
-    )
-
-
-def unknown_contents():
-    """
-    Hypothesis strategy returning random contents not ingested
-    into the test archive.
-    """
-    return lists(unknown_content(), min_size=2, max_size=8)
-
-
-def unknown_directory():
-    """
-    Hypothesis strategy returning a random directory not ingested
-    into the test archive.
-    """
-    return sha1().filter(
-        lambda s: len(
-            list(get_tests_data()["storage"].directory_missing([hash_to_bytes(s)]))
-        )
-        > 0
-    )
 
 
 def new_origin():
-    """
-    Hypothesis strategy returning a random origin not ingested
+    """Hypothesis strategy returning a random origin not ingested
     into the test archive.
     """
     return new_origin_strategy()
 
 
-def new_origins(nb_origins=None):
-    """
-    Hypothesis strategy returning random origins not ingested
-    into the test archive.
-    """
-    min_size = nb_origins if nb_origins is not None else 2
-    max_size = nb_origins if nb_origins is not None else 8
-    size = random.randint(min_size, max_size)
-    return lists(
-        new_origin(),
-        min_size=size,
-        max_size=size,
-        unique_by=lambda o: tuple(sorted(o.items())),
-    )
-
-
 def visit_dates(nb_dates=None):
-    """
-    Hypothesis strategy returning a list of visit dates.
+    """Hypothesis strategy returning a list of visit dates.
     """
     min_size = nb_dates if nb_dates else 2
     max_size = nb_dates if nb_dates else 8
     return lists(
         datetimes(
             min_value=datetime(2015, 1, 1, 0, 0),
-            max_value=datetime(2018, 12, 31, 0, 0),
+            max_value=datetime.now(),
             timezones=timezones(),
         ),
         min_size=min_size,
         max_size=max_size,
         unique=True,
     ).map(sorted)
 
 
-def unknown_release():
-    """
-    Hypothesis strategy returning a random revision not ingested
-    into the test archive.
-    """
-    return sha1().filter(
-        lambda s: get_tests_data()["storage"].release_get([s])[0] is None
-    )
-
-
-def unknown_revision():
-    """
-    Hypothesis strategy returning a random revision not ingested
-    into the test archive.
+def new_person():
+    """Hypothesis strategy returning random raw swh person data.
     """
-    return sha1().filter(
-        lambda s: get_tests_data()["storage"].revision_get([hash_to_bytes(s)])[0]
-        is None
-    )
-
-
-@composite
-def new_person(draw):
-    """
-    Hypothesis strategy returning random raw swh person data.
-    """
-    name = draw(
-        text(
-            min_size=5,
-            max_size=30,
-            alphabet=characters(min_codepoint=0, max_codepoint=255),
-        )
-    )
-    email = "%s@company.org" % name
-    return Person(
-        name=name.encode(),
-        email=email.encode(),
-        fullname=("%s <%s>" % (name, email)).encode(),
-    )
+    return new_person_strategy()
 
 
 @composite
 def new_swh_date(draw):
-    """
-    Hypothesis strategy returning random raw swh date data.
+    """Hypothesis strategy returning random raw swh date data.
     """
     timestamp = draw(
-        datetimes(
-            min_value=datetime(2015, 1, 1, 0, 0), max_value=datetime(2018, 12, 31, 0, 0)
-        ).map(lambda d: int(d.timestamp()))
+        datetimes(min_value=datetime(2015, 1, 1, 0, 0), max_value=datetime.now()).map(
+            lambda d: int(d.timestamp())
+        )
     )
     return {
         "timestamp": timestamp,
         "offset": 0,
         "negative_utc": False,
     }
 
 
 @composite
 def new_revision(draw):
-    """
-    Hypothesis strategy returning random raw swh revision data
+    """Hypothesis strategy returning random raw swh revision data
     not ingested into the test archive.
     """
     return Revision(
-        directory=draw(sha1().map(hash_to_bytes)),
+        directory=draw(sha1_git()),
         author=draw(new_person()),
         committer=draw(new_person()),
         message=draw(text(min_size=20, max_size=100).map(lambda t: t.encode())),
         date=TimestampWithTimezone.from_datetime(draw(new_swh_date())),
         committer_date=TimestampWithTimezone.from_datetime(draw(new_swh_date())),
         synthetic=False,
         type=RevisionType.GIT,
     )
 
 
-def unknown_revisions(min_size=2, max_size=8):
-    """
-    Hypothesis strategy returning random revisions not ingested
-    into the test archive.
-    """
-    return lists(unknown_revision(), min_size=min_size, max_size=max_size)
-
-
 def new_snapshots(nb_snapshots=None):
     min_size = nb_snapshots if nb_snapshots else 2
     max_size = nb_snapshots if nb_snapshots else 8
     return lists(
         new_snapshot(min_size=2, max_size=10, only_objects=True),
         min_size=min_size,
         max_size=max_size,
     )
-
-
-def unknown_snapshot():
-    """
-    Hypothesis strategy returning a random revision not ingested
-    into the test archive.
-    """
-    return sha1().filter(
-        lambda s: get_tests_data()["storage"].snapshot_get_branches(hash_to_bytes(s))
-        is None
-    )