diff --git a/swh/loader/package/deposit/tests/test_deposit.py b/swh/loader/package/deposit/tests/test_deposit.py
--- a/swh/loader/package/deposit/tests/test_deposit.py
+++ b/swh/loader/package/deposit/tests/test_deposit.py
@@ -209,11 +209,9 @@
     orig_meta = loader.storage.raw_extrinsic_metadata_get(
         MetadataTargetType.ORIGIN, url, authority
     )
-    assert orig_meta is not None
-    assert isinstance(orig_meta, dict)
-    assert len(orig_meta["results"]) == 1
-    assert orig_meta["next_page_token"] is None
-    orig_meta0 = orig_meta["results"][0]
+    assert orig_meta.next_page_token is None
+    assert len(orig_meta.results) == 1
+    orig_meta0 = orig_meta.results[0]
     assert orig_meta0.authority == authority
     assert orig_meta0.fetcher == fetcher
 
@@ -222,11 +220,9 @@
     rev_meta = loader.storage.raw_extrinsic_metadata_get(
         MetadataTargetType.REVISION, revision_swhid, authority
     )
-    assert rev_meta is not None
-    assert isinstance(rev_meta, dict)
-    assert len(rev_meta["results"]) == 1
-    assert rev_meta["next_page_token"] is None
-    rev_meta0 = rev_meta["results"][0]
+    assert rev_meta.next_page_token is None
+    assert len(rev_meta.results) == 1
+    rev_meta0 = rev_meta.results[0]
     assert rev_meta0.authority == authority
     assert rev_meta0.fetcher == fetcher
 
@@ -345,14 +341,10 @@
     orig_meta = loader.storage.raw_extrinsic_metadata_get(
         MetadataTargetType.ORIGIN, url, authority
     )
-    assert orig_meta is not None
-    assert isinstance(orig_meta, dict)
-    assert len(orig_meta["results"]) == 1
-    assert orig_meta["next_page_token"] is None
+    assert orig_meta.next_page_token is None
+    assert len(orig_meta.results) == 1
 
-    assert len(orig_meta["results"]) == 1
-
-    orig_meta0 = orig_meta["results"][0]
+    orig_meta0 = orig_meta.results[0]
 
     expected_metadata = RawExtrinsicMetadata(
         type=MetadataTargetType.ORIGIN,
@@ -380,14 +372,12 @@
     rev_meta = loader.storage.raw_extrinsic_metadata_get(
         MetadataTargetType.REVISION, revision_swhid, authority
     )
-    assert rev_meta is not None
-    assert isinstance(rev_meta, dict)
-    assert len(rev_meta["results"]) == 1
-    assert rev_meta["next_page_token"] is None
 
-    assert len(rev_meta["results"]) == 1
+    assert rev_meta.next_page_token is None
+
+    assert len(rev_meta.results) == 1
 
-    rev_meta0 = rev_meta["results"][0]
+    rev_meta0 = rev_meta.results[0]
 
     assert rev_meta0 == attr.evolve(
         expected_metadata,
diff --git a/swh/loader/package/tests/test_loader_metadata.py b/swh/loader/package/tests/test_loader_metadata.py
--- a/swh/loader/package/tests/test_loader_metadata.py
+++ b/swh/loader/package/tests/test_loader_metadata.py
@@ -124,14 +124,14 @@
     result = storage.raw_extrinsic_metadata_get(
         MetadataTargetType.REVISION, REVISION_SWHID, AUTHORITY,
     )
-    assert result["next_page_token"] is None
-    assert result["results"] == REVISION_METADATA
+    assert result.next_page_token is None
+    assert result.results == REVISION_METADATA
 
     result = storage.raw_extrinsic_metadata_get(
         MetadataTargetType.ORIGIN, ORIGIN_URL, AUTHORITY,
     )
-    assert result["next_page_token"] is None
-    assert result["results"] == ORIGIN_METADATA
+    assert result.next_page_token is None
+    assert result.results == ORIGIN_METADATA
 
     assert caplog.text == ""
 
@@ -154,8 +154,8 @@
     result = storage.raw_extrinsic_metadata_get(
         MetadataTargetType.REVISION, REVISION_SWHID, AUTHORITY,
     )
-    assert result["next_page_token"] is None
-    assert result["results"] == REVISION_METADATA
+    assert result.next_page_token is None
+    assert result.results == REVISION_METADATA
 
     assert caplog.text == ""
 
@@ -178,7 +178,7 @@
     result = storage.raw_extrinsic_metadata_get(
         MetadataTargetType.REVISION, REVISION_SWHID, AUTHORITY,
     )
-    assert result["next_page_token"] is None
-    assert result["results"] == REVISION_METADATA
+    assert result.next_page_token is None
+    assert result.results == REVISION_METADATA
 
     assert caplog.text == ""