diff --git a/tests/macro_benchmark/groups/create/edge.run.py b/tests/macro_benchmark/groups/create/edge.run.py
deleted file mode 100644
index fa484c5ce..000000000
--- a/tests/macro_benchmark/groups/create/edge.run.py
+++ /dev/null
@@ -1,12 +0,0 @@
-EDGE_COUNT = 100000
-BATCH_SIZE = 50
-
-query = []
-while EDGE_COUNT > 0:
-  query.append("MATCH (a), (b)")
-  new_edges = min(BATCH_SIZE, EDGE_COUNT)
-  query.append('CREATE (a)-[:Type]->(b) ' * new_edges)
-  query.append(";")
-  EDGE_COUNT -= new_edges
-
-print(" ".join(query))
diff --git a/tests/macro_benchmark/groups/create/pattern.run.py b/tests/macro_benchmark/groups/create/pattern.run.py
deleted file mode 100644
index ea7ded0ec..000000000
--- a/tests/macro_benchmark/groups/create/pattern.run.py
+++ /dev/null
@@ -1,11 +0,0 @@
-PATTERN_COUNT = 100000
-BATCH_SIZE = 50
-
-query = []
-while PATTERN_COUNT > 0:
-  new_patterns = min(BATCH_SIZE, PATTERN_COUNT)
-  query.append('CREATE ()-[:Type]->() ' * new_patterns)
-  query.append(";")
-  PATTERN_COUNT -= new_patterns
-
-print(" ".join(query))
diff --git a/tests/macro_benchmark/groups/create/vertex.run.py b/tests/macro_benchmark/groups/create/vertex.run.py
deleted file mode 100644
index 353392409..000000000
--- a/tests/macro_benchmark/groups/create/vertex.run.py
+++ /dev/null
@@ -1,11 +0,0 @@
-VERTEX_COUNT = 100000
-BATCH_SIZE = 50
-
-query = []
-while VERTEX_COUNT > 0:
-  new_vertices = min(BATCH_SIZE, VERTEX_COUNT)
-  query.append('CREATE ()' * new_vertices)
-  query.append(";")
-  VERTEX_COUNT -= new_vertices
-
-print(" ".join(query))
diff --git a/tests/macro_benchmark/groups/create/vertex_big.run.py b/tests/macro_benchmark/groups/create/vertex_big.run.py
deleted file mode 100644
index c7d80defc..000000000
--- a/tests/macro_benchmark/groups/create/vertex_big.run.py
+++ /dev/null
@@ -1,15 +0,0 @@
-VERTEX_COUNT = 100000
-BATCH_SIZE = 50
-
-query = []
-while VERTEX_COUNT > 0:
-  new_vertices = min(BATCH_SIZE, VERTEX_COUNT)
-  query.append('CREATE (:L1:L2:L3:L4:L5:L6:L7 '
-               '{p1: true, p2: 42, '
-               'p3: "Here is some text that is not extremely short", '
-               'p4:"Short text", p5: 234.434, p6: 11.11, p7: false})'
-               * new_vertices)
-  query.append(";")
-  VERTEX_COUNT -= new_vertices
-
-print(" ".join(query))
diff --git a/tests/macro_benchmark/groups/create/config.json b/tests/macro_benchmark/harness/groups/1000_create/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/create/config.json
rename to tests/macro_benchmark/harness/groups/1000_create/config.json
diff --git a/tests/macro_benchmark/groups/create/edge.iterteardown.cypher b/tests/macro_benchmark/harness/groups/1000_create/edge.iterteardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/create/edge.iterteardown.cypher
rename to tests/macro_benchmark/harness/groups/1000_create/edge.iterteardown.cypher
diff --git a/tests/macro_benchmark/harness/groups/1000_create/edge.run.py b/tests/macro_benchmark/harness/groups/1000_create/edge.run.py
new file mode 100644
index 000000000..d9347de8e
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/1000_create/edge.run.py
@@ -0,0 +1 @@
+print("MATCH (a), (b) CREATE (a)-[:Type]->(b);" * 1000)
diff --git a/tests/macro_benchmark/groups/create/edge.setup.cypher b/tests/macro_benchmark/harness/groups/1000_create/edge.setup.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/create/edge.setup.cypher
rename to tests/macro_benchmark/harness/groups/1000_create/edge.setup.cypher
diff --git a/tests/macro_benchmark/groups/create/pattern.iterteardown.cypher b/tests/macro_benchmark/harness/groups/1000_create/pattern.iterteardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/create/pattern.iterteardown.cypher
rename to tests/macro_benchmark/harness/groups/1000_create/pattern.iterteardown.cypher
diff --git a/tests/macro_benchmark/harness/groups/1000_create/pattern.run.py b/tests/macro_benchmark/harness/groups/1000_create/pattern.run.py
new file mode 100644
index 000000000..0bfd0f519
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/1000_create/pattern.run.py
@@ -0,0 +1 @@
+print("CREATE ()-[:Type]->();" * 1000)
diff --git a/tests/macro_benchmark/groups/create/teardown.cypher b/tests/macro_benchmark/harness/groups/1000_create/teardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/create/teardown.cypher
rename to tests/macro_benchmark/harness/groups/1000_create/teardown.cypher
diff --git a/tests/macro_benchmark/groups/create/vertex.iterteardown.cypher b/tests/macro_benchmark/harness/groups/1000_create/vertex.iterteardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/create/vertex.iterteardown.cypher
rename to tests/macro_benchmark/harness/groups/1000_create/vertex.iterteardown.cypher
diff --git a/tests/macro_benchmark/harness/groups/1000_create/vertex.run.py b/tests/macro_benchmark/harness/groups/1000_create/vertex.run.py
new file mode 100644
index 000000000..bf16e0a86
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/1000_create/vertex.run.py
@@ -0,0 +1 @@
+print("CREATE ();" * 1000)
diff --git a/tests/macro_benchmark/groups/create/vertex_big.iterteardown.cypher b/tests/macro_benchmark/harness/groups/1000_create/vertex_big.iterteardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/create/vertex_big.iterteardown.cypher
rename to tests/macro_benchmark/harness/groups/1000_create/vertex_big.iterteardown.cypher
diff --git a/tests/macro_benchmark/harness/groups/1000_create/vertex_big.run.py b/tests/macro_benchmark/harness/groups/1000_create/vertex_big.run.py
new file mode 100644
index 000000000..fb761897f
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/1000_create/vertex_big.run.py
@@ -0,0 +1 @@
+print("""CREATE (:L1:L2:L3:L4:L5:L6:L7 {p1: true, p2: 42, p3: "Here is some text that is not extremely short", p4:"Short text", p5: 234.434, p6: 11.11, p7: false});""" * 1000)
diff --git a/tests/macro_benchmark/groups/aggregation/config.json b/tests/macro_benchmark/harness/groups/aggregation/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation/config.json
rename to tests/macro_benchmark/harness/groups/aggregation/config.json
diff --git a/tests/macro_benchmark/groups/aggregation/count.run.cypher b/tests/macro_benchmark/harness/groups/aggregation/count.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation/count.run.cypher
rename to tests/macro_benchmark/harness/groups/aggregation/count.run.cypher
diff --git a/tests/macro_benchmark/groups/aggregation/min_max_avg.run.cypher b/tests/macro_benchmark/harness/groups/aggregation/min_max_avg.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation/min_max_avg.run.cypher
rename to tests/macro_benchmark/harness/groups/aggregation/min_max_avg.run.cypher
diff --git a/tests/macro_benchmark/groups/aggregation/setup.py b/tests/macro_benchmark/harness/groups/aggregation/setup.py
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation/setup.py
rename to tests/macro_benchmark/harness/groups/aggregation/setup.py
diff --git a/tests/macro_benchmark/groups/aggregation_parallel/config.json b/tests/macro_benchmark/harness/groups/aggregation_parallel/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation_parallel/config.json
rename to tests/macro_benchmark/harness/groups/aggregation_parallel/config.json
diff --git a/tests/macro_benchmark/groups/aggregation_parallel/count.run.py b/tests/macro_benchmark/harness/groups/aggregation_parallel/count.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation_parallel/count.run.py
rename to tests/macro_benchmark/harness/groups/aggregation_parallel/count.run.py
diff --git a/tests/macro_benchmark/groups/aggregation_parallel/min_max_avg.run.py b/tests/macro_benchmark/harness/groups/aggregation_parallel/min_max_avg.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation_parallel/min_max_avg.run.py
rename to tests/macro_benchmark/harness/groups/aggregation_parallel/min_max_avg.run.py
diff --git a/tests/macro_benchmark/groups/aggregation_parallel/setup.py b/tests/macro_benchmark/harness/groups/aggregation_parallel/setup.py
similarity index 100%
rename from tests/macro_benchmark/groups/aggregation_parallel/setup.py
rename to tests/macro_benchmark/harness/groups/aggregation_parallel/setup.py
diff --git a/tests/macro_benchmark/groups/create_parallel/config.json b/tests/macro_benchmark/harness/groups/create_parallel/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/create_parallel/config.json
rename to tests/macro_benchmark/harness/groups/create_parallel/config.json
diff --git a/tests/macro_benchmark/groups/create_parallel/iterteardown.cypher b/tests/macro_benchmark/harness/groups/create_parallel/iterteardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/create_parallel/iterteardown.cypher
rename to tests/macro_benchmark/harness/groups/create_parallel/iterteardown.cypher
diff --git a/tests/macro_benchmark/groups/create_parallel/vertex.run.py b/tests/macro_benchmark/harness/groups/create_parallel/vertex.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/create_parallel/vertex.run.py
rename to tests/macro_benchmark/harness/groups/create_parallel/vertex.run.py
diff --git a/tests/macro_benchmark/groups/delete/common.py b/tests/macro_benchmark/harness/groups/delete/common.py
similarity index 100%
rename from tests/macro_benchmark/groups/delete/common.py
rename to tests/macro_benchmark/harness/groups/delete/common.py
diff --git a/tests/macro_benchmark/groups/delete/config.json b/tests/macro_benchmark/harness/groups/delete/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/delete/config.json
rename to tests/macro_benchmark/harness/groups/delete/config.json
diff --git a/tests/macro_benchmark/groups/delete/edge.itersetup.py b/tests/macro_benchmark/harness/groups/delete/edge.itersetup.py
similarity index 100%
rename from tests/macro_benchmark/groups/delete/edge.itersetup.py
rename to tests/macro_benchmark/harness/groups/delete/edge.itersetup.py
diff --git a/tests/macro_benchmark/groups/delete/edge.run.cypher b/tests/macro_benchmark/harness/groups/delete/edge.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/delete/edge.run.cypher
rename to tests/macro_benchmark/harness/groups/delete/edge.run.cypher
diff --git a/tests/macro_benchmark/groups/delete/edge.setup.py b/tests/macro_benchmark/harness/groups/delete/edge.setup.py
similarity index 100%
rename from tests/macro_benchmark/groups/delete/edge.setup.py
rename to tests/macro_benchmark/harness/groups/delete/edge.setup.py
diff --git a/tests/macro_benchmark/groups/delete/teardown.cypher b/tests/macro_benchmark/harness/groups/delete/teardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/delete/teardown.cypher
rename to tests/macro_benchmark/harness/groups/delete/teardown.cypher
diff --git a/tests/macro_benchmark/groups/delete/vertex.itersetup.py b/tests/macro_benchmark/harness/groups/delete/vertex.itersetup.py
similarity index 100%
rename from tests/macro_benchmark/groups/delete/vertex.itersetup.py
rename to tests/macro_benchmark/harness/groups/delete/vertex.itersetup.py
diff --git a/tests/macro_benchmark/groups/delete/vertex.run.cypher b/tests/macro_benchmark/harness/groups/delete/vertex.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/delete/vertex.run.cypher
rename to tests/macro_benchmark/harness/groups/delete/vertex.run.cypher
diff --git a/tests/macro_benchmark/groups/delete/vertex_detach.itersetup.py b/tests/macro_benchmark/harness/groups/delete/vertex_detach.itersetup.py
similarity index 100%
rename from tests/macro_benchmark/groups/delete/vertex_detach.itersetup.py
rename to tests/macro_benchmark/harness/groups/delete/vertex_detach.itersetup.py
diff --git a/tests/macro_benchmark/groups/delete/vertex_detach.run.cypher b/tests/macro_benchmark/harness/groups/delete/vertex_detach.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/delete/vertex_detach.run.cypher
rename to tests/macro_benchmark/harness/groups/delete/vertex_detach.run.cypher
diff --git a/tests/macro_benchmark/groups/expression/common.py b/tests/macro_benchmark/harness/groups/expression/common.py
similarity index 100%
rename from tests/macro_benchmark/groups/expression/common.py
rename to tests/macro_benchmark/harness/groups/expression/common.py
diff --git a/tests/macro_benchmark/groups/expression/config.json b/tests/macro_benchmark/harness/groups/expression/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/expression/config.json
rename to tests/macro_benchmark/harness/groups/expression/config.json
diff --git a/tests/macro_benchmark/groups/expression/expression.run.py b/tests/macro_benchmark/harness/groups/expression/expression.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/expression/expression.run.py
rename to tests/macro_benchmark/harness/groups/expression/expression.run.py
diff --git a/tests/macro_benchmark/groups/match/config.json b/tests/macro_benchmark/harness/groups/match/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/match/config.json
rename to tests/macro_benchmark/harness/groups/match/config.json
diff --git a/tests/macro_benchmark/groups/match/pattern_cycle.run.py b/tests/macro_benchmark/harness/groups/match/pattern_cycle.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/pattern_cycle.run.py
rename to tests/macro_benchmark/harness/groups/match/pattern_cycle.run.py
diff --git a/tests/macro_benchmark/groups/match/pattern_long.run.py b/tests/macro_benchmark/harness/groups/match/pattern_long.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/pattern_long.run.py
rename to tests/macro_benchmark/harness/groups/match/pattern_long.run.py
diff --git a/tests/macro_benchmark/groups/match/pattern_short.run.py b/tests/macro_benchmark/harness/groups/match/pattern_short.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/pattern_short.run.py
rename to tests/macro_benchmark/harness/groups/match/pattern_short.run.py
diff --git a/tests/macro_benchmark/groups/match/pattern_where.run.py b/tests/macro_benchmark/harness/groups/match/pattern_where.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/pattern_where.run.py
rename to tests/macro_benchmark/harness/groups/match/pattern_where.run.py
diff --git a/tests/macro_benchmark/groups/match/setup.py b/tests/macro_benchmark/harness/groups/match/setup.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/setup.py
rename to tests/macro_benchmark/harness/groups/match/setup.py
diff --git a/tests/macro_benchmark/groups/match/teardown.cypher b/tests/macro_benchmark/harness/groups/match/teardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/match/teardown.cypher
rename to tests/macro_benchmark/harness/groups/match/teardown.cypher
diff --git a/tests/macro_benchmark/groups/match/vertex_on_label.run.py b/tests/macro_benchmark/harness/groups/match/vertex_on_label.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/vertex_on_label.run.py
rename to tests/macro_benchmark/harness/groups/match/vertex_on_label.run.py
diff --git a/tests/macro_benchmark/groups/match/vertex_on_label_property.run.py b/tests/macro_benchmark/harness/groups/match/vertex_on_label_property.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/vertex_on_label_property.run.py
rename to tests/macro_benchmark/harness/groups/match/vertex_on_label_property.run.py
diff --git a/tests/macro_benchmark/groups/match/vertex_on_property.run.py b/tests/macro_benchmark/harness/groups/match/vertex_on_property.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/match/vertex_on_property.run.py
rename to tests/macro_benchmark/harness/groups/match/vertex_on_property.run.py
diff --git a/tests/macro_benchmark/groups/return/combo.run.py b/tests/macro_benchmark/harness/groups/return/combo.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/return/combo.run.py
rename to tests/macro_benchmark/harness/groups/return/combo.run.py
diff --git a/tests/macro_benchmark/groups/return/config.json b/tests/macro_benchmark/harness/groups/return/config.json
similarity index 100%
rename from tests/macro_benchmark/groups/return/config.json
rename to tests/macro_benchmark/harness/groups/return/config.json
diff --git a/tests/macro_benchmark/groups/return/distinct.run.cypher b/tests/macro_benchmark/harness/groups/return/distinct.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/return/distinct.run.cypher
rename to tests/macro_benchmark/harness/groups/return/distinct.run.cypher
diff --git a/tests/macro_benchmark/groups/return/limit.run.cypher b/tests/macro_benchmark/harness/groups/return/limit.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/return/limit.run.cypher
rename to tests/macro_benchmark/harness/groups/return/limit.run.cypher
diff --git a/tests/macro_benchmark/groups/return/order_by.run.cypher b/tests/macro_benchmark/harness/groups/return/order_by.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/return/order_by.run.cypher
rename to tests/macro_benchmark/harness/groups/return/order_by.run.cypher
diff --git a/tests/macro_benchmark/groups/return/setup.py b/tests/macro_benchmark/harness/groups/return/setup.py
similarity index 100%
rename from tests/macro_benchmark/groups/return/setup.py
rename to tests/macro_benchmark/harness/groups/return/setup.py
diff --git a/tests/macro_benchmark/groups/return/skip.run.py b/tests/macro_benchmark/harness/groups/return/skip.run.py
similarity index 100%
rename from tests/macro_benchmark/groups/return/skip.run.py
rename to tests/macro_benchmark/harness/groups/return/skip.run.py
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/config.json b/tests/macro_benchmark/harness/groups/unwind_create/config.json
new file mode 100644
index 000000000..7f86768bd
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/config.json
@@ -0,0 +1,3 @@
+{
+    "iterations": 3
+}
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/edge.iterteardown.cypher b/tests/macro_benchmark/harness/groups/unwind_create/edge.iterteardown.cypher
new file mode 100644
index 000000000..b274b7474
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/edge.iterteardown.cypher
@@ -0,0 +1 @@
+MATCH (n)-[x]->(m) DELETE x
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/edge.run.cypher b/tests/macro_benchmark/harness/groups/unwind_create/edge.run.cypher
new file mode 100644
index 000000000..49d3c6292
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/edge.run.cypher
@@ -0,0 +1 @@
+MATCH (a), (b) WITH a, b UNWIND range(1, 100000) AS x CREATE (a)-[:Type]->(b)
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/edge.setup.cypher b/tests/macro_benchmark/harness/groups/unwind_create/edge.setup.cypher
new file mode 100644
index 000000000..6574cc965
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/edge.setup.cypher
@@ -0,0 +1 @@
+CREATE ()
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/pattern.iterteardown.cypher b/tests/macro_benchmark/harness/groups/unwind_create/pattern.iterteardown.cypher
new file mode 100644
index 000000000..37d4c9dd4
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/pattern.iterteardown.cypher
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/pattern.run.cypher b/tests/macro_benchmark/harness/groups/unwind_create/pattern.run.cypher
new file mode 100644
index 000000000..60b406548
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/pattern.run.cypher
@@ -0,0 +1 @@
+UNWIND range(1, 100000) AS x CREATE ()-[:Type]->()
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/teardown.cypher b/tests/macro_benchmark/harness/groups/unwind_create/teardown.cypher
new file mode 100644
index 000000000..37d4c9dd4
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/teardown.cypher
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/vertex.iterteardown.cypher b/tests/macro_benchmark/harness/groups/unwind_create/vertex.iterteardown.cypher
new file mode 100644
index 000000000..37d4c9dd4
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/vertex.iterteardown.cypher
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/vertex.run.cypher b/tests/macro_benchmark/harness/groups/unwind_create/vertex.run.cypher
new file mode 100644
index 000000000..829321ef0
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/vertex.run.cypher
@@ -0,0 +1 @@
+UNWIND range(1, 100000) AS x CREATE ()
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/vertex_big.iterteardown.cypher b/tests/macro_benchmark/harness/groups/unwind_create/vertex_big.iterteardown.cypher
new file mode 100644
index 000000000..37d4c9dd4
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/vertex_big.iterteardown.cypher
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n
diff --git a/tests/macro_benchmark/harness/groups/unwind_create/vertex_big.run.cypher b/tests/macro_benchmark/harness/groups/unwind_create/vertex_big.run.cypher
new file mode 100644
index 000000000..894133c48
--- /dev/null
+++ b/tests/macro_benchmark/harness/groups/unwind_create/vertex_big.run.cypher
@@ -0,0 +1 @@
+UNWIND range(1, 100000) AS x CREATE (:L1:L2:L3:L4:L5:L6:L7 {p1: true, p2: 42, p3: "Here is some text that is not extremely short", p4:"Short text", p5: 234.434, p6: 11.11, p7: false})
diff --git a/tests/macro_benchmark/groups/update/remove_label.itersetup.cypher b/tests/macro_benchmark/harness/groups/update/remove_label.itersetup.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/remove_label.itersetup.cypher
rename to tests/macro_benchmark/harness/groups/update/remove_label.itersetup.cypher
diff --git a/tests/macro_benchmark/groups/update/remove_label.run.cypher b/tests/macro_benchmark/harness/groups/update/remove_label.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/remove_label.run.cypher
rename to tests/macro_benchmark/harness/groups/update/remove_label.run.cypher
diff --git a/tests/macro_benchmark/groups/update/remove_property.itersetup.cypher b/tests/macro_benchmark/harness/groups/update/remove_property.itersetup.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/remove_property.itersetup.cypher
rename to tests/macro_benchmark/harness/groups/update/remove_property.itersetup.cypher
diff --git a/tests/macro_benchmark/groups/update/remove_property.run.cypher b/tests/macro_benchmark/harness/groups/update/remove_property.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/remove_property.run.cypher
rename to tests/macro_benchmark/harness/groups/update/remove_property.run.cypher
diff --git a/tests/macro_benchmark/groups/update/set_label.iterteardown.cypher b/tests/macro_benchmark/harness/groups/update/set_label.iterteardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/set_label.iterteardown.cypher
rename to tests/macro_benchmark/harness/groups/update/set_label.iterteardown.cypher
diff --git a/tests/macro_benchmark/groups/update/set_label.run.cypher b/tests/macro_benchmark/harness/groups/update/set_label.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/set_label.run.cypher
rename to tests/macro_benchmark/harness/groups/update/set_label.run.cypher
diff --git a/tests/macro_benchmark/groups/update/set_property.iterteardown.cypher b/tests/macro_benchmark/harness/groups/update/set_property.iterteardown.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/set_property.iterteardown.cypher
rename to tests/macro_benchmark/harness/groups/update/set_property.iterteardown.cypher
diff --git a/tests/macro_benchmark/groups/update/set_property.run.cypher b/tests/macro_benchmark/harness/groups/update/set_property.run.cypher
similarity index 100%
rename from tests/macro_benchmark/groups/update/set_property.run.cypher
rename to tests/macro_benchmark/harness/groups/update/set_property.run.cypher
diff --git a/tests/macro_benchmark/groups/update/setup.py b/tests/macro_benchmark/harness/groups/update/setup.py
similarity index 100%
rename from tests/macro_benchmark/groups/update/setup.py
rename to tests/macro_benchmark/harness/groups/update/setup.py
diff --git a/tests/macro_benchmark/harness/harness.py b/tests/macro_benchmark/harness/harness.py
index 72f7c137f..41787b3c8 100755
--- a/tests/macro_benchmark/harness/harness.py
+++ b/tests/macro_benchmark/harness/harness.py
@@ -137,7 +137,7 @@ class _QuerySuite:
         """
         argp = ArgumentParser("QuerySuite.scenarios argument parser")
         argp.add_argument("--query-scenarios-root", default=path.join(
-            DIR_PATH, "..", "groups"),
+            DIR_PATH, "groups"),
             dest="root")
         args, _ = argp.parse_known_args()
         log.info("Loading query scenarios from root: %s", args.root)
@@ -278,8 +278,6 @@ class _QuerySuite:
     def groups(self):
         """ Which groups can be executed by a QuerySuite scenario """
         assert False, "This is a base class, use one of derived suites"
-        return ["create", "match", "expression", "aggregation", "return",
-                "update", "delete", "hardcoded"]
 
 
 class QuerySuite(_QuerySuite):
@@ -290,8 +288,8 @@ class QuerySuite(_QuerySuite):
         return ["MemgraphRunner", "NeoRunner"]
 
     def groups(self):
-        return ["create", "match", "expression", "aggregation", "return",
-                "update", "delete"]
+        return ["1000_create", "unwind_create", "match", "expression",
+                "aggregation", "return", "update", "delete"]
 
 
 class QueryParallelSuite(_QuerySuite):
@@ -546,7 +544,7 @@ def main():
 
     log.info("Executing %d scenarios", len(filtered_scenarios))
     results = []
-    for (group, scenario_name), scenario in filtered_scenarios.items():
+    for (group, scenario_name), scenario in sorted(filtered_scenarios.items()):
         log.info("Executing group.scenario '%s.%s' with elements %s",
                  group, scenario_name, list(scenario.keys()))
         for iter_result in suite.run(scenario, group, scenario_name, runner):
diff --git a/tests/macro_benchmark/harness/jail_faker.py b/tests/macro_benchmark/harness/jail_faker.py
index 0889e9dc4..ff684fd49 100644
--- a/tests/macro_benchmark/harness/jail_faker.py
+++ b/tests/macro_benchmark/harness/jail_faker.py
@@ -234,5 +234,4 @@ def store_data(data):
         if not i in data:
             raise StorageException("Field '{}' missing in data!".format(i))
     data["timestamp"] = time.time()
-    print("STORE DATA:", data)
     _storage_file.write(json.dumps(data) + "\n")
diff --git a/tests/manual/bolt_client.cpp b/tests/manual/bolt_client.cpp
index 4242893fd..5437d7811 100644
--- a/tests/manual/bolt_client.cpp
+++ b/tests/manual/bolt_client.cpp
@@ -4,6 +4,7 @@
 #include "communication/bolt/client.hpp"
 #include "io/network/network_endpoint.hpp"
 #include "io/network/socket.hpp"
+#include "utils/timer.hpp"
 
 using SocketT = io::network::Socket;
 using EndpointT = io::network::NetworkEndpoint;
@@ -35,7 +36,10 @@ int main(int argc, char **argv) {
       break;
     }
     try {
+      utils::Timer t;
       auto ret = client.Execute(s, {});
+      auto elapsed = t.Elapsed().count();
+      std::cout << "Wall time:\n    " << elapsed << std::endl;
 
       std::cout << "Fields:" << std::endl;
       for (auto &field : ret.fields) {
@@ -43,7 +47,7 @@ int main(int argc, char **argv) {
       }
 
       std::cout << "Records:" << std::endl;
-      for (int i = 0; i < ret.records.size(); ++i) {
+      for (int i = 0; i < static_cast<int>(ret.records.size()); ++i) {
         std::cout << "    " << i << std::endl;
         for (auto &value : ret.records[i]) {
           std::cout << "        " << value << std::endl;
@@ -54,8 +58,7 @@ int main(int argc, char **argv) {
       for (auto &data : ret.metadata) {
         std::cout << "    " << data.first << " : " << data.second << std::endl;
       }
-    }
-    catch (const communication::bolt::ClientQueryException &e) {
+    } catch (const communication::bolt::ClientQueryException &e) {
       std::cout << "Client received exception: " << e.what() << std::endl;
     }
   }
diff --git a/tools/apollo/generate b/tools/apollo/generate
index ba77982ea..e88718e06 100755
--- a/tools/apollo/generate
+++ b/tools/apollo/generate
@@ -190,7 +190,9 @@ binary_release_path = os.path.join(BUILD_RELEASE_DIR, binary_release_name)
 binary_release_link_path = os.path.join(BUILD_RELEASE_DIR, "memgraph")
 
 # macro benchmark tests
-MACRO_BENCHMARK_ARGS = "QuerySuite MemgraphRunner --groups aggregation --no-strict"
+MACRO_BENCHMARK_ARGS = (
+    "QuerySuite MemgraphRunner " +
+    "--groups aggregation 1000_create unwind_create --no-strict")
 macro_bench_path = os.path.join(BASE_DIR, "tests", "macro_benchmark")
 harness_client_binary = os.path.join(BUILD_RELEASE_DIR, "tests",
         "macro_benchmark", "harness_client")