diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
index cdbc573a0e5..3288b521887 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
@@ -1,20 +1,21 @@
-| Test.kt:2:2:79:2 | Normal Exit | Test.kt:2:2:79:2 | Exit |
 | Test.kt:2:43:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:2:43:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
 | Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:11 | ... -> ... |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
 | Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:10:38:10 | x |
 | Test.kt:38:10:38:10 | x | Test.kt:38:17:41:3 | { ... } |
 | Test.kt:38:10:38:10 | x | Test.kt:43:3:43:3 | <Expr>; |
-| Test.kt:81:2:98:2 | Normal Exit | Test.kt:81:2:98:2 | Exit |
 | Test.kt:81:25:98:2 | { ... } | Test.kt:86:9:86:12 | true |
+| Test.kt:86:9:86:12 | true | Test.kt:88:8:88:14 | After ... > ... [false] |
 | Test.kt:86:9:86:12 | true | Test.kt:88:17:91:4 | { ... } |
 | Test.kt:86:9:86:12 | true | Test.kt:92:4:93:9 | <Expr>; |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:81:2:98:2 | Normal Exit |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:93:5:93:9 | break |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:94:4:95:12 | <Expr>; |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:8:94:14 | After ... (value equals) ... [false] |
 | Test.kt:94:4:95:12 | <Expr>; | Test.kt:95:12:95:12 | c |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
index b157cb5fca3..7fc18484feb 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.BasicBlock
 
 from Method func, BasicBlock dominator, BasicBlock bb
 where
   dominator.immediatelyDominates(bb) and
   dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, bb
+select getFirstAstNodeOrSynth(dominator), getFirstAstNodeOrSynth(bb)
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
index 7b3908b4b5d..6084c631b9d 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
@@ -1,20 +1,21 @@
-| Test.kt:2:2:79:2 | Normal Exit | Test.kt:2:2:79:2 | Exit |
 | Test.kt:2:43:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
 | Test.kt:2:43:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
 | Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:20 | <Expr>; |
 | Test.kt:18:3:18:20 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
 | Test.kt:18:3:18:20 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
 | Test.kt:18:3:18:20 | <Expr>; | Test.kt:24:4:24:11 | ... -> ... |
+| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
 | Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
 | Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:10:38:10 | x |
 | Test.kt:38:10:38:10 | x | Test.kt:38:17:41:3 | { ... } |
 | Test.kt:38:10:38:10 | x | Test.kt:43:3:43:15 | <Expr>; |
-| Test.kt:81:2:98:2 | Normal Exit | Test.kt:81:2:98:2 | Exit |
 | Test.kt:81:25:98:2 | { ... } | Test.kt:86:9:86:12 | true |
+| Test.kt:86:9:86:12 | true | Test.kt:88:8:88:14 | After ... > ... [false] |
 | Test.kt:86:9:86:12 | true | Test.kt:88:17:91:4 | { ... } |
 | Test.kt:86:9:86:12 | true | Test.kt:92:4:93:9 | <Expr>; |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:81:2:98:2 | Normal Exit |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:93:5:93:9 | break |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:94:4:95:12 | <Expr>; |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:8:94:14 | After ... (value equals) ... [false] |
 | Test.kt:94:4:95:12 | <Expr>; | Test.kt:95:12:95:12 | c |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
index b157cb5fca3..7fc18484feb 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.BasicBlock
 
 from Method func, BasicBlock dominator, BasicBlock bb
 where
   dominator.immediatelyDominates(bb) and
   dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, bb
+select getFirstAstNodeOrSynth(dominator), getFirstAstNodeOrSynth(bb)
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominator.expected b/java/ql/test/library-tests/controlflow/dominance/dominator.expected
index e7eafe4ecae..9836d4eed50 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test/library-tests/controlflow/dominance/dominator.expected
@@ -1,10 +1,10 @@
-| Test.java:2:6:2:9 | Normal Exit | Test.java:2:6:2:9 | Exit |
 | Test.java:2:32:72:2 | { ... } | Test.java:7:14:10:3 | { ... } |
 | Test.java:2:32:72:2 | { ... } | Test.java:10:10:12:3 | { ... } |
 | Test.java:2:32:72:2 | { ... } | Test.java:14:3:14:20 | <Expr>; |
 | Test.java:14:3:14:20 | <Expr>; | Test.java:2:6:2:9 | Normal Exit |
 | Test.java:14:3:14:20 | <Expr>; | Test.java:18:4:18:10 | <Expr>; |
 | Test.java:14:3:14:20 | <Expr>; | Test.java:20:11:20:11 | z |
+| Test.java:18:4:18:10 | <Expr>; | Test.java:26:7:26:12 | After ... == ... [false] |
 | Test.java:18:4:18:10 | <Expr>; | Test.java:26:15:29:3 | { ... } |
 | Test.java:18:4:18:10 | <Expr>; | Test.java:31:3:31:9 | <Expr>; |
 | Test.java:31:3:31:9 | <Expr>; | Test.java:34:10:34:10 | x |
@@ -14,6 +14,7 @@
 | Test.java:42:15:42:15 | j | Test.java:42:28:45:3 | { ... } |
 | Test.java:42:15:42:15 | j | Test.java:47:3:47:9 | <Expr>; |
 | Test.java:47:3:47:9 | <Expr>; | Test.java:50:15:50:15 | j |
+| Test.java:50:15:50:15 | j | Test.java:50:15:50:20 | After ... < ... [false] |
 | Test.java:50:15:50:15 | j | Test.java:50:28:64:3 | { ... } |
 | Test.java:50:15:50:15 | j | Test.java:66:3:66:17 | <Expr>; |
 | Test.java:50:28:64:3 | { ... } | Test.java:50:23:50:23 | j |
@@ -21,11 +22,12 @@
 | Test.java:50:28:64:3 | { ... } | Test.java:59:9:62:4 | { ... } |
 | Test.java:53:5:53:14 | if (...) | Test.java:53:16:56:5 | { ... } |
 | Test.java:53:5:53:14 | if (...) | Test.java:56:12:58:5 | { ... } |
-| Test.java:74:6:74:10 | Normal Exit | Test.java:74:6:74:10 | Exit |
 | Test.java:74:19:91:2 | { ... } | Test.java:79:9:79:12 | true |
+| Test.java:79:9:79:12 | true | Test.java:81:8:81:14 | After ... > ... [false] |
 | Test.java:79:9:79:12 | true | Test.java:81:17:84:4 | { ... } |
 | Test.java:79:9:79:12 | true | Test.java:85:4:85:15 | if (...) |
 | Test.java:85:4:85:15 | if (...) | Test.java:74:6:74:10 | Normal Exit |
 | Test.java:85:4:85:15 | if (...) | Test.java:86:5:86:10 | break |
 | Test.java:85:4:85:15 | if (...) | Test.java:87:4:87:15 | if (...) |
+| Test.java:87:4:87:15 | if (...) | Test.java:87:8:87:14 | After ... == ... [false] |
 | Test.java:87:4:87:15 | if (...) | Test.java:88:12:88:12 | c |
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominator.ql b/java/ql/test/library-tests/controlflow/dominance/dominator.ql
index b157cb5fca3..7fc18484feb 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test/library-tests/controlflow/dominance/dominator.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.BasicBlock
 
 from Method func, BasicBlock dominator, BasicBlock bb
 where
   dominator.immediatelyDominates(bb) and
   dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, bb
+select getFirstAstNodeOrSynth(dominator), getFirstAstNodeOrSynth(bb)