                     let testQuadStore = try quadStore(from: dataset, defaultGraph: testDefaultGraph)
                     if verbose {
                         print("Test quadstore: \(testQuadStore)")
-                    }
-                    let result = try query.execute(quadstore: testQuadStore, defaultGraph: testDefaultGraph)
+                        for (i, q) in testQuadStore.enumerated() {
+                            print("[\(i)] \(q)")
+                        }
+                        print("======================")
+                    }
+                    
+                    let result = try evaluate(query: query, in: testQuadStore, dataset: dataset, defaultGraph: testDefaultGraph)
                     if result == expectedResult {
                         results.append(.success(iri: test.value))
                     } else {

                    }
                    if let queryDataset = query.dataset {
                        if !queryDataset.isEmpty {
                            dataset = queryDataset
                        }
                    }

        return result
    }
    
    public func runEvaluationTests(inPath path: URL, testType: Term?, skip: Set<String>? = nil) throws -> [TestResult] {
        if let skip = skip {
            return try runEvaluationTests(inPath: path, testType: testType) {
