diff --git a/tests/tck/features/bugfix/AliasTypeDeduce.feature b/tests/tck/features/bugfix/AliasTypeDeduce.feature
index 60a1652ff73..958c2183788 100644
--- a/tests/tck/features/bugfix/AliasTypeDeduce.feature
+++ b/tests/tck/features/bugfix/AliasTypeDeduce.feature
@@ -9,21 +9,40 @@ Feature: Test extract filter
   Scenario: Extract filter bug
     When executing query:
       """
-      match p=allShortestPaths((v1)-[:like*1..3]-(v2)) where id(v1)=="Tim Duncan" and id(v2)=="Tony Parker" with nodes(p) as pathNodes WITH [n IN pathNodes | id(n)] AS personIdsInPath,   [idx IN range(1, size(pathNodes)-1) | [prev IN [pathNodes[idx-1]] | [curr IN [pathNodes[idx]] | [prev, curr]]]] AS vertList UNWIND vertList AS c WITH c[0][0][0] AS prev , c[0][0][1] AS curr OPTIONAL MATCH (curr)<-[e:like]-(:player)-[:serve]->(:team)-[:teammate]->(prev) RETURN count(e) AS cnt1, prev, curr
+      match p=allShortestPaths((v1)-[:like*1..3]-(v2))
+      where id(v1)=="Tim Duncan" and id(v2)=="Tony Parker"
+      with nodes(p) as pathNodes
+      WITH
+        [n IN pathNodes | id(n)] AS personIdsInPath,
+        [idx IN range(1, size(pathNodes)-1) | [prev IN [pathNodes[idx-1]] | [curr IN [pathNodes[idx]] | [prev, curr]]]] AS vertList
+      UNWIND vertList AS c
+      WITH c[0][0][0] AS prev , c[0][0][1] AS curr
+      OPTIONAL MATCH (curr)<-[e:like]-(:player)-[:serve]->(:team)-[:teammate]->(prev)
+      RETURN count(e) AS cnt1, prev, curr
       """
     Then the result should be, in any order:
       | cnt1 | prev                                                                                                        | curr                                                  |
       | 0    | ("Tim Duncan" :player{age: 42, name: "Tim Duncan"} :bachelor{name: "Tim Duncan", speciality: "psychology"}) | ("Tony Parker" :player{age: 36, name: "Tony Parker"}) |
     When executing query:
       """
-      match p=(a:player)-[e:like*1..3]->(b) where b.player.age>42 with relationships(p)[1] AS e1 match (b)-[:serve]->(c) where c.team.name>"S" and (b)-[e1]->() return count(c)
+      match p=(a:player)-[e:like*1..3]->(b)
+      where b.player.age>42
+      with relationships(p)[1] AS e1
+      match (b)-[:serve]->(c)
+      where c.team.name>"S" and (b)-[e1]->()
+      return count(c)
       """
     Then the result should be, in any order:
       | count(c) |
       | 3225     |
     When executing query:
       """
-      match p=(a:player)-[e:like*1..3]->(b) where b.player.age>42 with relationships(p)[1..2][0] AS e1 match (b)-[:serve]->(c) where c.team.name>"S" and (b)-[e1]->() return count(c)
+      match p=(a:player)-[e:like*1..3]->(b)
+      where b.player.age>42
+      with relationships(p)[1..2][0] AS e1
+      match (b)-[:serve]->(c)
+      where c.team.name>"S" and (b)-[e1]->()
+      return count(c)
       """
     Then the result should be, in any order:
       | count(c) |
diff --git a/tests/tck/features/optimizer/PushFilterDownHashInnerJoinRule.feature b/tests/tck/features/optimizer/PushFilterDownHashInnerJoinRule.feature
index 8cb8bb47cd7..4e0b3c36732 100644
--- a/tests/tck/features/optimizer/PushFilterDownHashInnerJoinRule.feature
+++ b/tests/tck/features/optimizer/PushFilterDownHashInnerJoinRule.feature
@@ -222,22 +222,6 @@ Feature: Push Filter down HashInnerJoin rule
       | 8  | Traverse       | 7            |                                                                                                     |
       | 7  | Argument       |              |                                                                                                     |
 
-  # Depends on the PR #4973
-  # When profiling query:
-  # """
-  # match p=(a:player)-[e:like*1..3]->(b)
-  # where b.player.age>42
-  # with relationships(p)[1] AS e1
-  # match (b)-[:serve]->(c)
-  # where c.team.name>'S' and (b)-[e1]->()
-  # return c
-  # order by c
-  # limit 1
-  # """
-  # Then the result should be, in any order:
-  # | e | v2 |
-  # And the execution plan should be:
-  # | id | name | dependencies | operator info |
   Scenario: NOT push filter down HashInnerJoin
     When profiling query:
       """