diff --git a/tests/test_sparql_model_adapter.py b/tests/test_sparql_model_adapter.py
index d69d643..82a198d 100644
--- a/tests/test_sparql_model_adapter.py
+++ b/tests/test_sparql_model_adapter.py
@@ -1,13 +1,17 @@
 """Pytest entry point for rdfproxy.SPARQLModelAdapter tests."""
 
+import secrets
+import string
+
 import pytest
 
 from rdfproxy import SPARQLModelAdapter
+from rdfproxy.utils._exceptions import UndefinedBindingException
 from tests.data.models import ComplexModel
 
 
 @pytest.mark.remote
-def test_sparql_model_adapter_basic(wikidata_wrapper):
+def test_sparql_model_adapter_basic():
     """Simple base test for SPARQLModelAdapter."""
     query = """
     select ?x ?y ?a ?p
@@ -17,8 +21,67 @@ def test_sparql_model_adapter_basic(wikidata_wrapper):
         }
     }
     """
-    wikidata_wrapper.setQuery(query)
-    adapter = SPARQLModelAdapter(sparql_wrapper=wikidata_wrapper)
-    model, *_ = adapter(query=query, model_constructor=ComplexModel)
+    adapter = SPARQLModelAdapter(
+        target="https://query.wikidata.org/bigdata/namespace/wdq/sparql",
+        query=query,
+        model=ComplexModel,
+    )
+
+    assert all(isinstance(model, ComplexModel) for model in adapter.query())
+
+
+@pytest.mark.remote
+def test_sparql_model_adapter_grouping_basic():
+    query = """
+    select ?x ?y ?a ?p ?z
+    where {
+        values (?x ?y ?a ?p ?z) {
+           (1 2 "a value" "p value" 3)
+           (1 22 "other value" "yet another value" 3)
+           (2 22 "other value" "yet another value" 3)
+          }
+    }
+    """
+
+    adapter = SPARQLModelAdapter(
+        target="https://query.wikidata.org/bigdata/namespace/wdq/sparql",
+        query=query,
+        model=ComplexModel,
+    )
+
+    group_x = adapter._query_group_by("x")
+    group_y = adapter._query_group_by("y")
+    group_z = adapter._query_group_by("z")
+
+    assert {1, 2} == set(len(v) for _, v in group_x.items())
+    assert {1, 2} == set(len(v) for _, v in group_y.items())
+    assert {3} == set(len(v) for _, v in group_z.items())
+
+
+@pytest.mark.remote
+@pytest.mark.parametrize(
+    "var",
+    ["".join(secrets.choice(string.ascii_letters) for i in range(8)) for e in range(10)]
+    + ["and", "as", "assert"],
+)
+def test_sparql_model_adapter_grouping_basic_fail(var):
+    query = """
+    select ?x ?y ?a ?p ?z
+    where {
+        values (?x ?y ?a ?p ?z) {
+           (1 2 "a value" "p value" 3)
+           (1 22 "other value" "yet another value" 3)
+           (2 22 "other value" "yet another value" 3)
+          }
+    }
+    """
+
+    adapter = SPARQLModelAdapter(
+        target="https://query.wikidata.org/bigdata/namespace/wdq/sparql",
+        query=query,
+        model=ComplexModel,
+    )
 
-    assert isinstance(model, ComplexModel)
+    if var not in ["x", "y", "a", "p", "z"]:
+        with pytest.raises(UndefinedBindingException):
+            group = adapter._query_group_by(var)  # noqa: F841