diff --git a/aql/hierarchy_test.go b/aql/hierarchy_test.go
index e2a71953ec7eb0db59f3b26dd50bcbf61d9affc1..f743ca85d1699178b3432b7b8b014c781dc6c6e1 100644
--- a/aql/hierarchy_test.go
+++ b/aql/hierarchy_test.go
@@ -52,25 +52,29 @@ func TestHierarchyBasic(t *testing.T) {
 		"filters": [
 			{
 				"ID": 0,
-				"filteredType": "entity",
-				"filteredID": 0,
+				"fromType": "entity",
+				"fromID": 0,
+				"toType": "relation",
+				"toID": 0,
 				"attribute": "age",
-				"dataType": "int",
-				"matchType": "NEQ",
-				"value": "40",
+				"value": "45",
+				"dataType": "number",
+				"matchType": "GT",
 				"inType": "",
-				"inID": 0
+				"inID": -1
 			},
 			{
 				"ID": 1,
-				"filteredType": "relation",
-				"filteredID": 0,
+				"fromType": "relation",
+				"fromID": 0,
+				"toType": "relation",
+				"toID": 1,
 				"attribute": "isChairman",
-				"dataType": "bool",
-				"matchType": "exact",
-				"value": "true",
+				"value": "45",
+				"dataType": "number",
+				"matchType": "GT",
 				"inType": "",
-				"inID": 0
+				"inID": -1
 			}
 		],
 		"limit": 5000
@@ -130,25 +134,29 @@ func TestHierarchyRandomStart(t *testing.T) {
 		"filters": [
 			{
 				"ID": 0,
-				"filteredType": "entity",
-				"filteredID": 0,
+				"fromType": "entity",
+				"fromID": 0,
+				"toType": "relation",
+				"toID": 0,
 				"attribute": "age",
-				"dataType": "int",
-				"matchType": "NEQ",
-				"value": "40",
+				"value": "45",
+				"dataType": "number",
+				"matchType": "GT",
 				"inType": "",
-				"inID": 0
+				"inID": -1
 			},
 			{
 				"ID": 1,
-				"filteredType": "relation",
-				"filteredID": 0,
+				"fromType": "relation",
+				"fromID": 0,
+				"toType": "relation",
+				"toID": 1,
 				"attribute": "isChairman",
-				"dataType": "bool",
-				"matchType": "exact",
-				"value": "true",
+				"value": "45",
+				"dataType": "number",
+				"matchType": "GT",
 				"inType": "",
-				"inID": 0
+				"inID": -1
 			}
 		],
 		"limit": 5000
@@ -309,6 +317,8 @@ func TestHierarchyWithGroupby(t *testing.T) {
 
 	for i := range JSONQuery.Entities {
 		search(&JSONQuery, i)
+
+		fmt.Println(listoflists)
 		sortedListOfLists := make([]pdictList, len(listoflists))
 		for i, list := range listoflists {
 			k := make(pdictList, list.Len())