diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a558a5411..098305df0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
         args: ["--fix"]
   - repo: https://github.com/psf/black-pre-commit-mirror
     # WARNING: Black version should be the same as in `pyproject.toml`
-    rev: "25.1.0"
+    rev: "24.4.2"
     hooks:
     - id: black
       pass_filenames: false
@@ -24,6 +24,5 @@ repos:
     rev: 2.1.1
     hooks:
     - id: poetry-check
-    - id: poetry-lock
       # sadly `--no-update` does not work on pre-commit.ci
-      args: ["--check"]
+      args: ["--lock"]
diff --git a/rdflib/plugins/parsers/notation3.py b/rdflib/plugins/parsers/notation3.py
index da71405e0..4df892ee4 100755
--- a/rdflib/plugins/parsers/notation3.py
+++ b/rdflib/plugins/parsers/notation3.py
@@ -57,7 +57,7 @@
 
 from rdflib.compat import long_type
 from rdflib.exceptions import ParserError
-from rdflib.graph import ConjunctiveGraph, Graph, QuotedGraph
+from rdflib.graph import Dataset, Graph, QuotedGraph
 from rdflib.term import (
     _XSD_PFX,
     BNode,
@@ -2047,7 +2047,7 @@ def parse(  # type: ignore[override]
         elif not fa:
             raise ParserError("Cannot parse N3 into non-formula-aware store.")
 
-        conj_graph = ConjunctiveGraph(store=graph.store)
+        conj_graph = Dataset(store=graph.store)
         conj_graph.default_context = graph  # TODO: CG __init__ should have a
         # default_context arg
         # TODO: update N3Processor so that it can use conj_graph as the sink
diff --git a/test/test_graph/test_diff.py b/test/test_graph/test_diff.py
index 696d8be89..a1d4f948e 100644
--- a/test/test_graph/test_diff.py
+++ b/test/test_graph/test_diff.py
@@ -9,7 +9,7 @@
 import rdflib
 from rdflib import Graph
 from rdflib.compare import graph_diff
-from rdflib.graph import ConjunctiveGraph, Dataset
+from rdflib.graph import Dataset
 from rdflib.namespace import FOAF, RDF
 from rdflib.term import BNode, Literal
 from test.utils import (
@@ -111,7 +111,7 @@ def as_element_set(self, value: _ElementSetTypeOrStr) -> _ElementSetType:
         if isinstance(value, str):
             graph = self.graph_type()
             graph.parse(data=value, format=self.format)
-            if isinstance(graph, ConjunctiveGraph):
+            if isinstance(graph, Dataset):
                 return GraphHelper.quad_set(graph, BNodeHandling.COLLAPSE)
             else:
                 return GraphHelper.triple_set(graph, BNodeHandling.COLLAPSE)
diff --git a/test/test_graph/test_graph_context.py b/test/test_graph/test_graph_context.py
index 7d0a90f7c..8c1a8a457 100644
--- a/test/test_graph/test_graph_context.py
+++ b/test/test_graph/test_graph_context.py
@@ -291,71 +291,63 @@ def test_triples(self):
 
         for c in [graph, self.graph.get_context(c1)]:
             # unbound subjects
-            asserte(set(c.subjects(likes, pizza)), set((michel, tarek)))
-            asserte(set(c.subjects(hates, pizza)), set((bob,)))
-            asserte(set(c.subjects(likes, cheese)), set([tarek, bob, michel]))
+            asserte(set(c.subjects(likes, pizza)), {michel, tarek})
+            asserte(set(c.subjects(hates, pizza)), {bob})
+            asserte(set(c.subjects(likes, cheese)), {tarek, bob, michel})
             asserte(set(c.subjects(hates, cheese)), set())
 
             # unbound objects
-            asserte(set(c.objects(michel, likes)), set([cheese, pizza]))
-            asserte(set(c.objects(tarek, likes)), set([cheese, pizza]))
-            asserte(set(c.objects(bob, hates)), set([michel, pizza]))
-            asserte(set(c.objects(bob, likes)), set([cheese]))
+            asserte(set(c.objects(michel, likes)), {cheese, pizza})
+            asserte(set(c.objects(tarek, likes)), {cheese, pizza})
+            asserte(set(c.objects(bob, hates)), {michel, pizza})
+            asserte(set(c.objects(bob, likes)), {cheese})
 
             # unbound predicates
-            asserte(set(c.predicates(michel, cheese)), set([likes]))
-            asserte(set(c.predicates(tarek, cheese)), set([likes]))
-            asserte(set(c.predicates(bob, pizza)), set([hates]))
-            asserte(set(c.predicates(bob, michel)), set([hates]))
+            asserte(set(c.predicates(michel, cheese)), {likes})
+            asserte(set(c.predicates(tarek, cheese)), {likes})
+            asserte(set(c.predicates(bob, pizza)), {hates})
+            asserte(set(c.predicates(bob, michel)), {hates})
 
-            asserte(set(c.subject_objects(hates)), set([(bob, pizza), (bob, michel)]))
+            asserte(set(c.subject_objects(hates)), {(bob, pizza), (bob, michel)})
             asserte(
                 set(c.subject_objects(likes)),
-                set(
-                    [
-                        (tarek, cheese),
-                        (michel, cheese),
-                        (michel, pizza),
-                        (bob, cheese),
-                        (tarek, pizza),
-                    ]
-                ),
+                {
+                    (tarek, cheese),
+                    (michel, cheese),
+                    (michel, pizza),
+                    (bob, cheese),
+                    (tarek, pizza),
+                },
             )
 
-            asserte(
-                set(c.predicate_objects(michel)), set([(likes, cheese), (likes, pizza)])
-            )
+            asserte(set(c.predicate_objects(michel)), {(likes, cheese), (likes, pizza)})
             asserte(
                 set(c.predicate_objects(bob)),
-                set([(likes, cheese), (hates, pizza), (hates, michel)]),
-            )
-            asserte(
-                set(c.predicate_objects(tarek)), set([(likes, cheese), (likes, pizza)])
+                {(likes, cheese), (hates, pizza), (hates, michel)},
             )
+            asserte(set(c.predicate_objects(tarek)), {(likes, cheese), (likes, pizza)})
 
             asserte(
                 set(c.subject_predicates(pizza)),
-                set([(bob, hates), (tarek, likes), (michel, likes)]),
+                {(bob, hates), (tarek, likes), (michel, likes)},
             )
             asserte(
                 set(c.subject_predicates(cheese)),
-                set([(bob, likes), (tarek, likes), (michel, likes)]),
+                {(bob, likes), (tarek, likes), (michel, likes)},
             )
-            asserte(set(c.subject_predicates(michel)), set([(bob, hates)]))
+            asserte(set(c.subject_predicates(michel)), {(bob, hates)})
 
             asserte(
                 set(c),
-                set(
-                    [
-                        (bob, hates, michel),
-                        (bob, likes, cheese),
-                        (tarek, likes, pizza),
-                        (michel, likes, pizza),
-                        (michel, likes, cheese),
-                        (bob, hates, pizza),
-                        (tarek, likes, cheese),
-                    ]
-                ),
+                {
+                    (bob, hates, michel),
+                    (bob, likes, cheese),
+                    (tarek, likes, pizza),
+                    (michel, likes, pizza),
+                    (michel, likes, cheese),
+                    (bob, hates, pizza),
+                    (tarek, likes, cheese),
+                },
             )
 
         # remove stuff and make sure the graph is empty again
diff --git a/test/test_graph/test_graph_formula.py b/test/test_graph/test_graph_formula.py
index 0f77dc294..eebc8385a 100644
--- a/test/test_graph/test_graph_formula.py
+++ b/test/test_graph/test_graph_formula.py
@@ -4,7 +4,7 @@
 import pytest
 
 from rdflib import RDF, RDFS, BNode, URIRef, Variable, plugin
-from rdflib.graph import ConjunctiveGraph, QuotedGraph
+from rdflib.graph import Dataset, QuotedGraph
 
 implies = URIRef("http://www.w3.org/2000/10/swap/log#implies")
 testN3 = """
@@ -21,7 +21,7 @@
 
 def checkFormulaStore(store="default", configString=None):  # noqa: N802, N803
     try:
-        g = ConjunctiveGraph(store=store)
+        g = Dataset(store=store)
     except ImportError:
         pytest.skip("Dependencies for store '%s' not available!" % store)
 
@@ -48,7 +48,7 @@ def checkFormulaStore(store="default", configString=None):  # noqa: N802, N803
         d = URIRef("http://test/d")
         v = Variable("y")
 
-        universe = ConjunctiveGraph(g.store)
+        universe = Dataset(g.store)
 
         # test formula as terms
         assert len(list(universe.triples((formulaA, implies, formulaB)))) == 1
diff --git a/test/test_graph/test_namespace_rebinding.py b/test/test_graph/test_namespace_rebinding.py
index babac1b4f..253fbedc2 100644
--- a/test/test_graph/test_namespace_rebinding.py
+++ b/test/test_graph/test_namespace_rebinding.py
@@ -1,6 +1,6 @@
 import pytest
 
-from rdflib import ConjunctiveGraph, Graph, Literal
+from rdflib import Dataset, Graph, Literal
 from rdflib.namespace import OWL, Namespace, NamespaceManager
 from rdflib.plugins.stores.memory import Memory
 from rdflib.term import URIRef
@@ -292,12 +292,11 @@ def test_multigraph_bindings():
     assert list(g1.namespaces()) == [("friend-of-a-friend", foaf1_uri)]
 
     # Including newly-created objects that use the store
-    cg = ConjunctiveGraph(store=store)
+    cg = Dataset(store=store, default_union=True)
     cg.namespace_manager = NamespaceManager(cg, bind_namespaces="core")
 
     assert ("foaf", foaf1_uri) not in list(cg.namespaces())
     assert ("friend-of-a-friend", foaf1_uri) in list(cg.namespaces())
-
     assert len(list(g1.namespaces())) == 6
     assert len(list(g2.namespaces())) == 6
     assert len(list(cg.namespaces())) == 6
diff --git a/test/test_n3.py b/test/test_n3.py
index f3d7eeb07..d2c362a39 100644
--- a/test/test_n3.py
+++ b/test/test_n3.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from rdflib.graph import ConjunctiveGraph, Graph
+from rdflib.graph import Dataset, Graph
 from rdflib.plugins.parsers.notation3 import BadSyntax, exponent_syntax
 from rdflib.term import Literal, URIRef
 from test import TEST_DIR
@@ -44,7 +44,7 @@
                 n3:predicate :p;
                 n3:object :y ] a log:Truth}.
 
-# Needs more thought ... ideally, we have the implcit AND rules of
+# Needs more thought ... ideally, we have the implicit AND rules of
 # juxtaposition (introduction and elimination)
 
 {
@@ -125,9 +125,9 @@ def test_base_serialize(self):
         )
         s = g.serialize(base="http://example.com/", format="n3", encoding="latin-1")
         assert b"<people/Bob>" in s
-        g2 = ConjunctiveGraph()
-        g2.parse(data=s, publicID="http://example.com/", format="n3")
-        assert list(g) == list(g2)
+        g2 = Dataset()
+        g2.parse(data=s, format="n3")
+        assert list(g) == list(g2.triples((None, None, None)))
 
     def test_issue23(self):
         input = """<http://example.com/article1> <http://example.com/title> "this word is in \\u201Cquotes\\u201D"."""
@@ -195,24 +195,24 @@ def test_dot_in_prefix(self):
         )
 
     def test_model(self):
-        g = ConjunctiveGraph()
+        g = Dataset()
         g.parse(data=test_data, format="n3")
         i = 0
-        for s, p, o in g:
+        for s, p, o, c in g:
             if isinstance(s, Graph):
                 i += 1
         assert i == 3
-        assert len(list(g.contexts())) == 13
+        assert len(list(g.graphs())) == 13
 
         g.close()
 
     def test_quoted_serialization(self):
-        g = ConjunctiveGraph()
+        g = Dataset()
         g.parse(data=test_data, format="n3")
         g.serialize(format="n3")
 
     def test_parse(self):
-        g = ConjunctiveGraph()
+        g = Dataset()
         try:
             g.parse(
                 "http://groups.csail.mit.edu/dig/2005/09/rein/examples/troop42-policy.n3",
@@ -229,14 +229,14 @@ def test_single_quoted_literals(self):
 
         for data in test_data:
             # N3 doesn't accept single quotes around string literals
-            g = ConjunctiveGraph()
+            g = Dataset()
             with pytest.raises(BadSyntax):
                 g.parse(data=data, format="n3")
 
-            g = ConjunctiveGraph()
+            g = Dataset()
             g.parse(data=data, format="turtle")
             assert len(g) == 1
-            for _, _, o in g:
+            for _, _, o, c in g:
                 assert o == Literal("o")
 
     def test_empty_prefix(self):
diff --git a/test/test_parsers/test_empty_xml_base.py b/test/test_parsers/test_empty_xml_base.py
index 0f3f18694..0225c4c63 100644
--- a/test/test_parsers/test_empty_xml_base.py
+++ b/test/test_parsers/test_empty_xml_base.py
@@ -5,7 +5,7 @@
 and RDF/XML dependence on it
 """
 
-from rdflib.graph import ConjunctiveGraph
+from rdflib.graph import Dataset
 from rdflib.namespace import FOAF, RDF
 from rdflib.term import URIRef
 
@@ -36,7 +36,7 @@
 
 class TestEmptyBase:
     def test_empty_base_ref(self):
-        self.graph = ConjunctiveGraph()
+        self.graph = Dataset()
         self.graph.parse(data=test_data, publicID=baseUri, format="xml")
         assert (
             len(list(self.graph)) > 0
@@ -50,7 +50,7 @@ def test_empty_base_ref(self):
 
 class TestRelativeBase:
     def test_relative_base_ref(self):
-        self.graph = ConjunctiveGraph()
+        self.graph = Dataset()
         self.graph.parse(data=test_data2, publicID=baseUri2, format="xml")
         assert (
             len(self.graph) > 0
diff --git a/test/test_parsers/test_nquads.py b/test/test_parsers/test_nquads.py
index ad17b5aee..ee14856ab 100644
--- a/test/test_parsers/test_nquads.py
+++ b/test/test_parsers/test_nquads.py
@@ -1,6 +1,7 @@
 import os
 
-from rdflib import ConjunctiveGraph, Namespace, URIRef
+from rdflib import Dataset, Literal, URIRef
+from rdflib.namespace import FOAF
 from test.data import TEST_DATA_DIR
 
 TEST_BASE = os.path.join(TEST_DATA_DIR, "nquads.rdflib")
@@ -8,7 +9,7 @@
 
 class TestNQuadsParser:
     def _load_example(self):
-        g = ConjunctiveGraph()
+        g = Dataset()
         nq_path = os.path.relpath(
             os.path.join(TEST_DATA_DIR, "nquads.rdflib/example.nquads"), os.curdir
         )
@@ -21,9 +22,9 @@ def test_01_simple_open(self):
         assert len(g.store) == 449
 
     def test_02_contexts(self):
-        # There should be 16 separate contexts
+        # There should be 17 separate contexts - 16 Named + default
         g = self._load_example()
-        assert len([x for x in g.store.contexts()]) == 16
+        assert len([x for x in g.store.contexts()]) == 17
 
     def test_03_get_value(self):
         # is the name of entity E10009 "Arco Publications"?
@@ -36,11 +37,11 @@ def test_03_get_value(self):
 
         g = self._load_example()
         s = URIRef("http://bibliographica.org/entity/E10009")
-        FOAF = Namespace("http://xmlns.com/foaf/0.1/")  # noqa: N806
-        assert g.value(s, FOAF.name).eq("Arco Publications")
+        for s, p, o, c in list(g.quads((s, FOAF.name, None, None))):
+            assert o == Literal("Arco Publications")
 
     def test_context_is_optional(self):
-        g = ConjunctiveGraph()
+        g = Dataset()
         nq_path = os.path.relpath(
             os.path.join(TEST_DATA_DIR, "nquads.rdflib/test6.nq"), os.curdir
         )
@@ -49,7 +50,7 @@ def test_context_is_optional(self):
         assert len(g) > 0
 
     def test_serialize(self):
-        g = ConjunctiveGraph()
+        g = Dataset()
         uri1 = URIRef("http://example.org/mygraph1")
         uri2 = URIRef("http://example.org/mygraph2")
 
@@ -63,7 +64,7 @@ def test_serialize(self):
         s = g.serialize(format="nquads", encoding="utf-8")
         assert len([x for x in s.split(b"\n") if x.strip()]) == 2
 
-        g2 = ConjunctiveGraph()
+        g2 = Dataset()
         g2.parse(data=s, format="nquads")
 
         assert len(g) == len(g2)
@@ -89,8 +90,8 @@ def teardown_method(self, method):
 
     def test_parse_shared_bnode_context(self):
         bnode_ctx = dict()
-        g = ConjunctiveGraph()
-        h = ConjunctiveGraph()
+        g = Dataset()
+        h = Dataset()
         g.parse(self.data, format="nquads", bnode_context=bnode_ctx)
         self.data.seek(0)
         h.parse(self.data, format="nquads", bnode_context=bnode_ctx)
@@ -98,7 +99,7 @@ def test_parse_shared_bnode_context(self):
 
     def test_parse_shared_bnode_context_same_graph(self):
         bnode_ctx = dict()
-        g = ConjunctiveGraph()
+        g = Dataset()
         g.parse(self.data_obnodes, format="nquads", bnode_context=bnode_ctx)
         o1 = set(g.objects())
         self.data_obnodes.seek(0)
@@ -107,27 +108,27 @@ def test_parse_shared_bnode_context_same_graph(self):
         assert o1 == o2
 
     def test_parse_distinct_bnode_context(self):
-        g = ConjunctiveGraph()
+        g = Dataset()
         g.parse(self.data, format="nquads", bnode_context=dict())
-        s1 = set(g.subjects())
+        s1 = set([x for x, p, o, c in list(g.quads((None, None, None, None)))])
         self.data.seek(0)
         g.parse(self.data, format="nquads", bnode_context=dict())
-        s2 = set(g.subjects())
+        s2 = set([x for x, p, o, c in list(g.quads((None, None, None, None)))])
         assert set() != (s2 - s1)
 
     def test_parse_distinct_bnode_contexts_between_graphs(self):
-        g = ConjunctiveGraph()
-        h = ConjunctiveGraph()
+        g = Dataset()
+        h = Dataset()
         g.parse(self.data, format="nquads")
-        s1 = set(g.subjects())
+        s1 = sorted(set([x for x, p, o, c in list(g.quads((None, None, None, None)))]))
         self.data.seek(0)
         h.parse(self.data, format="nquads")
-        s2 = set(h.subjects())
+        s2 = sorted(set([x for x, p, o, c in list(h.quads((None, None, None, None)))]))
         assert s1 != s2
 
     def test_parse_distinct_bnode_contexts_named_graphs(self):
-        g = ConjunctiveGraph()
-        h = ConjunctiveGraph()
+        g = Dataset()
+        h = Dataset()
         g.parse(self.data, format="nquads")
         self.data.seek(0)
         h.parse(self.data, format="nquads")
@@ -135,9 +136,17 @@ def test_parse_distinct_bnode_contexts_named_graphs(self):
 
     def test_parse_shared_bnode_contexts_named_graphs(self):
         bnode_ctx = dict()
-        g = ConjunctiveGraph()
-        h = ConjunctiveGraph()
-        g.parse(self.data, format="nquads", bnode_context=bnode_ctx)
+        g = Dataset()
+        h = Dataset()
+        g.parse(
+            TEST_DATA_DIR / "nquads.rdflib/bnode_context.nquads",
+            format="nquads",
+            bnode_context=bnode_ctx,
+        )
         self.data.seek(0)
-        h.parse(self.data, format="nquads", bnode_context=bnode_ctx)
+        h.parse(
+            TEST_DATA_DIR / "nquads.rdflib/bnode_context.nquads",
+            format="nquads",
+            bnode_context=bnode_ctx,
+        )
         assert set(h.contexts()) == set(g.contexts())
diff --git a/test/test_parsers/test_parser_hext.py b/test/test_parsers/test_parser_hext.py
index c71bd1a49..17d19fa26 100644
--- a/test/test_parsers/test_parser_hext.py
+++ b/test/test_parsers/test_parser_hext.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from rdflib import BNode, ConjunctiveGraph, Dataset, Literal, URIRef
+from rdflib import BNode, Dataset, Literal, URIRef
 from rdflib.compare import isomorphic
 from rdflib.graph import DATASET_DEFAULT_GRAPH_ID
 from rdflib.namespace import XSD
@@ -97,7 +97,7 @@ def test_small_string_cg():
         ["http://example.com/s01", "http://example.com/op1", "http://example.com/o2", "globalId", "", ""]
         ["http://example.com/s01", "http://example.com/op2", "http://example.com/o3", "globalId", "", ""]
         """
-    d = ConjunctiveGraph(identifier=DATASET_DEFAULT_GRAPH_ID)
+    d = Dataset()
     d.parse(data=s, format="hext")
 
     expected_graph_names = (
@@ -140,7 +140,7 @@ def test_small_file_multigraph():
 
 
 def test_small_file_multigraph_cg():
-    d = ConjunctiveGraph()
+    d = Dataset()
     assert len(d) == 0
     d.parse(
         Path(__file__).parent.parent / "data/test_parser_hext_multigraph.ndjson",
@@ -185,14 +185,14 @@ def test_roundtrip():
         print(f"Test {tests}: {f}")
         if f.name not in files_to_skip.keys():
             try:
-                cg = ConjunctiveGraph().parse(f, format="nt")
+                cg = Dataset().parse(f, format="nt")
                 # print(cg.serialize(format="n3"))
             except Exception:
                 print("Skipping: could not NT parse")
                 skipped += 1
                 skip = True
             if not skip:
-                cg2 = ConjunctiveGraph()
+                cg2 = Dataset()
                 cg2.parse(
                     data=cg.serialize(format="hext"),
                     format="hext",
diff --git a/test/test_parsers/test_trix_parse.py b/test/test_parsers/test_trix_parse.py
index e6f2ae91b..e48cf9b07 100644
--- a/test/test_parsers/test_trix_parse.py
+++ b/test/test_parsers/test_trix_parse.py
@@ -1,6 +1,6 @@
 import os
 
-from rdflib.graph import ConjunctiveGraph
+from rdflib.graph import Dataset
 from test.data import TEST_DATA_DIR
 
 
@@ -12,7 +12,7 @@ def teardown_method(self):
         pass
 
     def testAperture(self):  # noqa: N802
-        g = ConjunctiveGraph()
+        g = Dataset()
 
         trix_path = os.path.relpath(
             os.path.join(TEST_DATA_DIR, "suites", "trix/trix-aperture.trix"), os.curdir
@@ -24,12 +24,12 @@ def testAperture(self):  # noqa: N802
         t = sum(map(len, g.contexts()))
 
         assert t == 24
-        assert len(c) == 4
+        assert len(c) == 5
 
         # print "Parsed %d triples"%t
 
     def testSpec(self):  # noqa: N802
-        g = ConjunctiveGraph()
+        g = Dataset()
 
         trix_path = os.path.relpath(
             os.path.join(TEST_DATA_DIR, "suites", "trix/trix-nokia-example.trix"),
@@ -40,7 +40,7 @@ def testSpec(self):  # noqa: N802
         # print "Parsed %d triples"%len(g)
 
     def testNG4j(self):  # noqa: N802
-        g = ConjunctiveGraph()
+        g = Dataset()
 
         trix_path = os.path.relpath(
             os.path.join(TEST_DATA_DIR, "suites", "trix/trix-ng4j-test-01.trix"),
diff --git a/test/test_serializers/test_serializer_hext.py b/test/test_serializers/test_serializer_hext.py
index 2b0577bc1..de39e37dc 100644
--- a/test/test_serializers/test_serializer_hext.py
+++ b/test/test_serializers/test_serializer_hext.py
@@ -1,7 +1,7 @@
 import json
 from pathlib import Path
 
-from rdflib import ConjunctiveGraph, Dataset, Graph
+from rdflib import Dataset, Graph
 
 
 def test_hext_graph():
@@ -90,7 +90,7 @@ def test_hext_graph():
 
 def test_hext_cg():
     """Tests ConjunctiveGraph data"""
-    d = ConjunctiveGraph()
+    d = Dataset()
     trig_data = """
             PREFIX ex: <http://example.com/>
             PREFIX owl: <http://www.w3.org/2002/07/owl#>
diff --git a/test/test_serializers/test_serializer_trix.py b/test/test_serializers/test_serializer_trix.py
index bdfc91c81..37bc5912f 100644
--- a/test/test_serializers/test_serializer_trix.py
+++ b/test/test_serializers/test_serializer_trix.py
@@ -1,6 +1,6 @@
 from io import BytesIO
 
-from rdflib.graph import ConjunctiveGraph, Graph
+from rdflib.graph import Dataset, Graph
 from rdflib.term import Literal, URIRef
 
 
@@ -19,7 +19,7 @@ def test_serialize():
     g2 = Graph(identifier=s2)
     g2.add((r2, label, Literal("label 3")))
 
-    g = ConjunctiveGraph()
+    g = Dataset()
     for s, p, o in g1.triples((None, None, None)):
         g.addN([(s, p, o, g1)])
     for s, p, o in g2.triples((None, None, None)):
@@ -28,14 +28,14 @@ def test_serialize():
     g.add((r3, label, Literal(4)))
 
     r = g.serialize(format="trix", encoding="utf-8")
-    g3 = ConjunctiveGraph()
+    g3 = Dataset()
 
     g3.parse(BytesIO(r), format="trix")
 
     for q in g3.quads((None, None, None)):
         # TODO: Fix once getGraph/getContext is in conjunctive graph
-        if isinstance(q[3].identifier, URIRef):
-            tg = Graph(store=g.store, identifier=q[3].identifier)
+        if isinstance(q[3], URIRef):
+            tg = Graph(store=g.store, identifier=q[3])
         else:
             # BNode, this is a bit ugly
             # we cannot match the bnode to the right graph automagically
@@ -74,7 +74,7 @@ def test_issue_250():
 
     """
 
-    graph = ConjunctiveGraph()
+    graph = Dataset()
     graph.bind(None, "http://defaultnamespace")
     sg = graph.serialize(format="trix")
     assert 'xmlns="http://defaultnamespace"' not in sg, sg
diff --git a/test/test_serializers/test_serializer_xml.py b/test/test_serializers/test_serializer_xml.py
index eda0b3d43..535b24c85 100644
--- a/test/test_serializers/test_serializer_xml.py
+++ b/test/test_serializers/test_serializer_xml.py
@@ -1,6 +1,6 @@
 from io import BytesIO
 
-from rdflib.graph import ConjunctiveGraph
+from rdflib.graph import Dataset
 from rdflib.namespace import RDFS
 from rdflib.plugins.serializers.rdfxml import XMLSerializer
 from rdflib.term import BNode, URIRef
@@ -10,7 +10,7 @@ class SerializerTestBase:
     repeats = 8
 
     def setup_method(self):
-        graph = ConjunctiveGraph()
+        graph = Dataset(default_union=True)
         graph.parse(data=self.test_content, format=self.test_content_format)
         self.source_graph = graph
 
@@ -40,13 +40,13 @@ def _assert_equal_graphs(g1, g2):
 
 
 def _mangled_copy(g):
-    "Makes a copy of the graph, replacing all bnodes with the bnode ``_blank``."
-    gcopy = ConjunctiveGraph()
+    """Makes a copy of the graph, replacing all bnodes with the bnode ``_blank``."""
+    gcopy = Dataset()
 
     def isbnode(v):
         return isinstance(v, BNode)
 
-    for s, p, o in g:
+    for s, p, o, c in g:
         if isbnode(s):
             s = _blank
         if isbnode(p):
@@ -67,8 +67,8 @@ def serialize(source_graph, make_serializer, get_value=True, extra_args={}):
 def serialize_and_load(source_graph, make_serializer):
     stream = serialize(source_graph, make_serializer, False)
     stream.seek(0)
-    reparsed_graph = ConjunctiveGraph()
-    reparsed_graph.parse(stream, publicID=None, format="xml")
+    reparsed_graph = Dataset(default_union=True)
+    reparsed_graph.parse(stream, format="xml")
     return reparsed_graph
 
 
@@ -173,7 +173,7 @@ def test_result_fragments_with_base(self):
             '<rdf:Description rdf:nodeID="'.encode("latin-1") in rdf_xml
         ), "expected one identified bnode in serialized graph"
 
-    def test_subslass_of_objects(self):
+    def test_subclass_of_objects(self):
         reparsed_graph = serialize_and_load(self.source_graph, self.serializer)
         _assert_expected_object_types_for_predicates(
             reparsed_graph, [RDFS.seeAlso, RDFS.subClassOf], [URIRef, BNode]
@@ -181,7 +181,7 @@ def test_subslass_of_objects(self):
 
 
 def _assert_expected_object_types_for_predicates(graph, predicates, types):
-    for s, p, o in graph:
+    for s, p, o, c in graph:
         if p in predicates:
             some_true = [isinstance(o, t) for t in types]
             assert (
diff --git a/test/test_sparql/test_initbindings.py b/test/test_sparql/test_initbindings.py
index 0cb55f344..55f5853a3 100644
--- a/test/test_sparql/test_initbindings.py
+++ b/test/test_sparql/test_initbindings.py
@@ -1,8 +1,8 @@
-from rdflib import ConjunctiveGraph, Literal, URIRef, Variable
+from rdflib import Dataset, Literal, URIRef, Variable
 from rdflib.plugins.sparql import prepareQuery
 from test.utils.namespace import EGDC
 
-g = ConjunctiveGraph()
+g = Dataset()
 
 
 def test_str():
@@ -272,7 +272,7 @@ def test_prepare():
 
 
 def test_data():
-    data = ConjunctiveGraph()
+    data = Dataset()
     data += [
         (URIRef("urn:a"), URIRef("urn:p"), Literal("a")),
         (URIRef("urn:b"), URIRef("urn:p"), Literal("b")),
@@ -297,7 +297,7 @@ def test_ask():
     assert a == b, "ask: %r != %r" % (a, b)
 
 
-g2 = ConjunctiveGraph()
+g2 = Dataset()
 g2.bind("", EGDC)
 g2.add((EGDC["s1"], EGDC["p"], EGDC["o1"]))
 g2.add((EGDC["s2"], EGDC["p"], EGDC["o2"]))
diff --git a/test/test_sparql/test_sparql.py b/test/test_sparql/test_sparql.py
index a42f7ffa5..74d7d9b72 100644
--- a/test/test_sparql/test_sparql.py
+++ b/test/test_sparql/test_sparql.py
@@ -9,7 +9,7 @@
 import rdflib.plugins.sparql
 import rdflib.plugins.sparql.operators
 import rdflib.plugins.sparql.parser
-from rdflib import BNode, ConjunctiveGraph, Graph, Literal, URIRef
+from rdflib import BNode, Dataset, Graph, Literal, URIRef
 from rdflib.compare import isomorphic
 from rdflib.namespace import RDF, RDFS, Namespace
 from rdflib.plugins.sparql import prepareQuery, sparql
@@ -182,11 +182,11 @@ def test_bindings():
 
 
 def test_named_filter_graph_query():
-    g = ConjunctiveGraph()
-    g.namespace_manager.bind("rdf", RDF)
-    g.namespace_manager.bind("rdfs", RDFS)
+    g = Dataset(default_union=True)
+    g.bind("rdf", RDF)
+    g.bind("rdfs", RDFS)
     ex = Namespace("https://ex.com/")
-    g.namespace_manager.bind("ex", ex)
+    g.bind("ex", ex)
     g.get_context(ex.g1).parse(
         format="turtle",
         data=f"""
diff --git a/test/test_tools/test_chunk_serializer.py b/test/test_tools/test_chunk_serializer.py
index d683ca606..9d68c0c04 100644
--- a/test/test_tools/test_chunk_serializer.py
+++ b/test/test_tools/test_chunk_serializer.py
@@ -84,7 +84,7 @@ def test_chunk_by_size(tmp_path: Path):
         (TEST_DATA_DIR / "defined_namespaces/mf.ttl", 100, ..., False, True, 1),
     ],
 )
-def test_chuking(
+def test_chunking(
     tmp_path: Path,
     test_graph_path: Path,
     max_triples: Union[ellipsis, int],
diff --git a/test/test_trig.py b/test/test_trig.py
index 1c158fa86..afcf2c4cf 100644
--- a/test/test_trig.py
+++ b/test/test_trig.py
@@ -16,7 +16,7 @@ def test_empty():
 
 
 def test_repeat_triples():
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.get_context("urn:a").add(
         (rdflib.URIRef("urn:1"), rdflib.URIRef("urn:2"), rdflib.URIRef("urn:3"))
     )
@@ -33,7 +33,7 @@ def test_repeat_triples():
 
 
 def test_same_subject():
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.get_context("urn:a").add(
         (rdflib.URIRef("urn:1"), rdflib.URIRef("urn:p1"), rdflib.URIRef("urn:o1"))
     )
@@ -54,7 +54,7 @@ def test_same_subject():
 
 
 def test_remember_namespace():
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.add(TRIPLE + (rdflib.URIRef("http://example.com/graph1"),))
     # In 4.2.0 the first serialization would fail to include the
     # prefix for the graph but later serialize() calls would work.
@@ -65,14 +65,14 @@ def test_remember_namespace():
 
 
 def test_graph_qname_syntax():
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.add(TRIPLE + (rdflib.URIRef("http://example.com/graph1"),))
     out = g.serialize(format="trig", encoding="latin-1")
     assert b"ns1:graph1 {" not in out
 
 
 def test_graph_uri_syntax():
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     # getQName will not abbreviate this, so it should serialize as
     # a '<...>' term.
     g.add(TRIPLE + (rdflib.URIRef("http://example.com/foo."),))
@@ -81,7 +81,7 @@ def test_graph_uri_syntax():
 
 
 def test_blank_graph_identifier():
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.add(TRIPLE + (rdflib.BNode(),))
     out = g.serialize(format="trig", encoding="latin-1")
     graph_label_line = out.splitlines()[-4]
@@ -94,7 +94,7 @@ def test_graph_parsing():
     data = """
 <http://example.com/thing#thing_a> <http://example.com/knows> <http://example.com/thing#thing_b> .
 """
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.parse(data=data, format="trig")
     assert len(list(g.contexts())) == 1
 
@@ -104,7 +104,7 @@ def test_graph_parsing():
 
 { <http://example.com/thing#thing_c> <http://example.com/knows> <http://example.com/thing#thing_d> . }
 """
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.parse(data=data, format="trig")
     assert len(list(g.contexts())) == 1
 
@@ -118,7 +118,7 @@ def test_graph_parsing():
     <http://example.com/thing/thing_e> <http://example.com/knows> <http://example.com/thing#thing_f> .
 }
 """
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.parse(data=data, format="trig")
     assert len(list(g.contexts())) == 2
 
@@ -133,7 +133,7 @@ def test_round_trips():
     <http://example.com/thing/thing_e> <http://example.com/knows> <http://example.com/thing#thing_f> .
 }
 """
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     for i in range(5):
         g.parse(data=data, format="trig")
         data = g.serialize(format="trig")
@@ -154,7 +154,7 @@ def test_default_graph_serializes_without_name():
 
 { <http://example.com/thing#thing_c> <http://example.com/knows> <http://example.com/thing#thing_d> . }
 """
-    g = rdflib.ConjunctiveGraph()
+    g = rdflib.Dataset()
     g.parse(data=data, format="trig")
     data = g.serialize(format="trig", encoding="latin-1")
 
@@ -174,7 +174,7 @@ def test_prefixes():
     }
     """
 
-    cg = rdflib.ConjunctiveGraph()
+    cg = rdflib.Dataset()
     cg.parse(data=data, format="trig")
     data = cg.serialize(format="trig", encoding="latin-1")
 
diff --git a/test/test_turtle_quoting.py b/test/test_turtle_quoting.py
index aa523f57b..7cdd63a24 100644
--- a/test/test_turtle_quoting.py
+++ b/test/test_turtle_quoting.py
@@ -12,7 +12,7 @@
 
 import pytest
 
-from rdflib.graph import ConjunctiveGraph, Graph
+from rdflib.graph import Dataset, Graph
 from rdflib.plugins.parsers import ntriples
 from rdflib.term import Literal, URIRef
 from test.utils.namespace import EGDC
@@ -147,7 +147,7 @@ def test_parse_correctness(
         data = f'<example:Subject> <example:Predicate> "{quoted}" <example:Graph>.'
     else:
         data = f'<example:Subject> <example:Predicate> "{quoted}".'
-    graph = ConjunctiveGraph()
+    graph = Dataset(default_union=True)
     graph.parse(data=data, format=format)
     objs = list(graph.objects())
     assert len(objs) == 1
diff --git a/test/test_util.py b/test/test_util.py
index 63c085033..890697475 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -9,7 +9,7 @@
 import pytest
 
 from rdflib import XSD, util
-from rdflib.graph import ConjunctiveGraph, Graph, QuotedGraph
+from rdflib.graph import Dataset, Graph, QuotedGraph
 from rdflib.namespace import RDF, RDFS
 from rdflib.term import BNode, IdentifiedNode, Literal, Node, URIRef
 from rdflib.util import _coalesce, _iri2uri, find_roots, get_tree
@@ -262,7 +262,7 @@ def parse_n3(term_n3):
                 "@prefix  xsd: <http://www.w3.org/2001/XMLSchema#> .\n"
                 "<urn:no_use> <urn:no_use> %s.\n" % term_n3
             )
-            g = ConjunctiveGraph()
+            g = Dataset(default_union=True)
             g.parse(data=prepstr, format="n3")
             return [t for t in g.triples((None, None, None))][0][2]
 
diff --git a/test_reports/rdflib_w3c_sparql10-HEAD.ttl b/test_reports/rdflib_w3c_sparql10-HEAD.ttl
index f3ac4255d..b8369a94d 100644
--- a/test_reports/rdflib_w3c_sparql10-HEAD.ttl
+++ b/test_reports/rdflib_w3c_sparql10-HEAD.ttl
@@ -1603,7 +1603,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/solution-seq/manifest#slice-3> .
 
diff --git a/test_reports/rdflib_w3c_sparql11-HEAD.ttl b/test_reports/rdflib_w3c_sparql11-HEAD.ttl
index 6d498df8b..6140fa914 100644
--- a/test_reports/rdflib_w3c_sparql11-HEAD.ttl
+++ b/test_reports/rdflib_w3c_sparql11-HEAD.ttl
@@ -691,7 +691,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/csv-tsv-res/manifest#csv01> .
 
@@ -699,7 +699,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/csv-tsv-res/manifest#csv02> .
 
@@ -707,7 +707,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/csv-tsv-res/manifest#csv03> .
 
@@ -715,7 +715,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/csv-tsv-res/manifest#tsv01> .
 
@@ -723,7 +723,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/csv-tsv-res/manifest#tsv02> .
 
@@ -731,7 +731,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/csv-tsv-res/manifest#tsv03> .
 
@@ -1939,7 +1939,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/functions/manifest#plus-1> .
 
@@ -1947,7 +1947,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/functions/manifest#plus-2> .
 
@@ -2251,7 +2251,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/json-res/manifest#jsonres01> .
 
@@ -2259,7 +2259,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/json-res/manifest#jsonres02> .