diff --git a/swh/graph/tests/dataset/orc/content/content-all.orc b/swh/graph/tests/dataset/orc/content/content-all.orc
new file mode 100644
index 0000000..b038074
Binary files /dev/null and b/swh/graph/tests/dataset/orc/content/content-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/content/graph-all.orc b/swh/graph/tests/dataset/orc/content/graph-all.orc
deleted file mode 100644
index 363c2e2..0000000
Binary files a/swh/graph/tests/dataset/orc/content/graph-all.orc and /dev/null differ
diff --git a/swh/graph/tests/dataset/orc/directory/directory-all.orc b/swh/graph/tests/dataset/orc/directory/directory-all.orc
new file mode 100644
index 0000000..2df504e
Binary files /dev/null and b/swh/graph/tests/dataset/orc/directory/directory-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/directory/graph-all.orc b/swh/graph/tests/dataset/orc/directory/graph-all.orc
deleted file mode 100644
index 110022c..0000000
Binary files a/swh/graph/tests/dataset/orc/directory/graph-all.orc and /dev/null differ
diff --git a/swh/graph/tests/dataset/orc/directory_entry/graph-all.orc b/swh/graph/tests/dataset/orc/directory_entry/directory_entry-all.orc
similarity index 63%
rename from swh/graph/tests/dataset/orc/directory_entry/graph-all.orc
rename to swh/graph/tests/dataset/orc/directory_entry/directory_entry-all.orc
index a50dbdf..1a3d9f4 100644
Binary files a/swh/graph/tests/dataset/orc/directory_entry/graph-all.orc and b/swh/graph/tests/dataset/orc/directory_entry/directory_entry-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/origin/graph-all.orc b/swh/graph/tests/dataset/orc/origin/graph-all.orc
deleted file mode 100644
index ce6d20d..0000000
Binary files a/swh/graph/tests/dataset/orc/origin/graph-all.orc and /dev/null differ
diff --git a/swh/graph/tests/dataset/orc/origin/origin-all.orc b/swh/graph/tests/dataset/orc/origin/origin-all.orc
new file mode 100644
index 0000000..cec803a
Binary files /dev/null and b/swh/graph/tests/dataset/orc/origin/origin-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/origin_visit/graph-all.orc b/swh/graph/tests/dataset/orc/origin_visit/origin_visit-all.orc
similarity index 57%
rename from swh/graph/tests/dataset/orc/origin_visit/graph-all.orc
rename to swh/graph/tests/dataset/orc/origin_visit/origin_visit-all.orc
index f8be379..c7965bb 100644
Binary files a/swh/graph/tests/dataset/orc/origin_visit/graph-all.orc and b/swh/graph/tests/dataset/orc/origin_visit/origin_visit-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/origin_visit_status/graph-all.orc b/swh/graph/tests/dataset/orc/origin_visit_status/graph-all.orc
deleted file mode 100644
index 459b070..0000000
Binary files a/swh/graph/tests/dataset/orc/origin_visit_status/graph-all.orc and /dev/null differ
diff --git a/swh/graph/tests/dataset/orc/origin_visit_status/origin_visit_status-all.orc b/swh/graph/tests/dataset/orc/origin_visit_status/origin_visit_status-all.orc
new file mode 100644
index 0000000..0a19cb1
Binary files /dev/null and b/swh/graph/tests/dataset/orc/origin_visit_status/origin_visit_status-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/release/graph-all.orc b/swh/graph/tests/dataset/orc/release/graph-all.orc
deleted file mode 100644
index 2814c58..0000000
Binary files a/swh/graph/tests/dataset/orc/release/graph-all.orc and /dev/null differ
diff --git a/swh/graph/tests/dataset/orc/release/release-all.orc b/swh/graph/tests/dataset/orc/release/release-all.orc
new file mode 100644
index 0000000..888fa82
Binary files /dev/null and b/swh/graph/tests/dataset/orc/release/release-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/revision/graph-all.orc b/swh/graph/tests/dataset/orc/revision/graph-all.orc
deleted file mode 100644
index eae72a8..0000000
Binary files a/swh/graph/tests/dataset/orc/revision/graph-all.orc and /dev/null differ
diff --git a/swh/graph/tests/dataset/orc/revision/revision-all.orc b/swh/graph/tests/dataset/orc/revision/revision-all.orc
new file mode 100644
index 0000000..8c186d1
Binary files /dev/null and b/swh/graph/tests/dataset/orc/revision/revision-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/revision_extra_headers/revision_extra_headers-all.orc b/swh/graph/tests/dataset/orc/revision_extra_headers/revision_extra_headers-all.orc
new file mode 100644
index 0000000..05a6b8d
Binary files /dev/null and b/swh/graph/tests/dataset/orc/revision_extra_headers/revision_extra_headers-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/revision_history/graph-all.orc b/swh/graph/tests/dataset/orc/revision_history/revision_history-all.orc
similarity index 51%
rename from swh/graph/tests/dataset/orc/revision_history/graph-all.orc
rename to swh/graph/tests/dataset/orc/revision_history/revision_history-all.orc
index e37fb9a..92f1748 100644
Binary files a/swh/graph/tests/dataset/orc/revision_history/graph-all.orc and b/swh/graph/tests/dataset/orc/revision_history/revision_history-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/skipped_content/graph-all.orc b/swh/graph/tests/dataset/orc/skipped_content/skipped_content-all.orc
similarity index 65%
rename from swh/graph/tests/dataset/orc/skipped_content/graph-all.orc
rename to swh/graph/tests/dataset/orc/skipped_content/skipped_content-all.orc
index ef38ff2..ed19277 100644
Binary files a/swh/graph/tests/dataset/orc/skipped_content/graph-all.orc and b/swh/graph/tests/dataset/orc/skipped_content/skipped_content-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/snapshot/graph-all.orc b/swh/graph/tests/dataset/orc/snapshot/graph-all.orc
deleted file mode 100644
index 20ebb80..0000000
Binary files a/swh/graph/tests/dataset/orc/snapshot/graph-all.orc and /dev/null differ
diff --git a/swh/graph/tests/dataset/orc/snapshot/snapshot-all.orc b/swh/graph/tests/dataset/orc/snapshot/snapshot-all.orc
new file mode 100644
index 0000000..41bee79
Binary files /dev/null and b/swh/graph/tests/dataset/orc/snapshot/snapshot-all.orc differ
diff --git a/swh/graph/tests/dataset/orc/snapshot_branch/graph-all.orc b/swh/graph/tests/dataset/orc/snapshot_branch/snapshot_branch-all.orc
similarity index 57%
rename from swh/graph/tests/dataset/orc/snapshot_branch/graph-all.orc
rename to swh/graph/tests/dataset/orc/snapshot_branch/snapshot_branch-all.orc
index 28cb698..c3a11b6 100644
Binary files a/swh/graph/tests/dataset/orc/snapshot_branch/graph-all.orc and b/swh/graph/tests/dataset/orc/snapshot_branch/snapshot_branch-all.orc differ