diff --git a/java/ql/test-kotlin1/library-tests/exprs_typeaccess/PrintAst.expected b/java/ql/test-kotlin1/library-tests/exprs_typeaccess/PrintAst.expected
index e8b7b5dc2395..b93ecd86d270 100644
--- a/java/ql/test-kotlin1/library-tests/exprs_typeaccess/PrintAst.expected
+++ b/java/ql/test-kotlin1/library-tests/exprs_typeaccess/PrintAst.expected
@@ -111,6 +111,7 @@ B.java:
 #    1|   1: [Class] B
 #    2|     2: [Constructor] B
 #    2|       5: [BlockStmt] { ... }
+#    2|         0: [SuperConstructorInvocationStmt] super(...)
 #    3|         1: [EmptyStmt] ;
 #    6|     3: [Method] fn
 #    6|       3: [TypeAccess] void
diff --git a/java/ql/test-kotlin2/library-tests/exprs_typeaccess/PrintAst.expected b/java/ql/test-kotlin2/library-tests/exprs_typeaccess/PrintAst.expected
index 3a7af6919ed8..94e77d16b3d1 100644
--- a/java/ql/test-kotlin2/library-tests/exprs_typeaccess/PrintAst.expected
+++ b/java/ql/test-kotlin2/library-tests/exprs_typeaccess/PrintAst.expected
@@ -110,6 +110,7 @@ B.java:
 #    1|   1: [Class] B
 #    2|     2: [Constructor] B
 #    2|       5: [BlockStmt] { ... }
+#    2|         0: [SuperConstructorInvocationStmt] super(...)
 #    3|         1: [EmptyStmt] ;
 #    6|     3: [Method] fn
 #    6|       3: [TypeAccess] void
diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected
index 05db00aa26de..0e1dd647e411 100644
--- a/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected
+++ b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected
@@ -1 +1 @@
-| Test.java:0:0:0:0 | Test | Test.java:1:1:1:1 | Test | Compact source file 'Test' contains implicit class 'Test' |
+| Test.java:0:0:0:0 | Test | Test.java:1:1:29:1 | Test | Compact source file 'Test' contains implicit class 'Test' |
diff --git a/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected
index 61dcdd8a17ff..9bfaaecbbcb1 100644
--- a/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected
+++ b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected
@@ -1,2 +1,2 @@
-| Test.java:1:1:1:1 | Test | implicit |
+| Test.java:1:1:29:1 | Test | implicit |
 | Test.java:25:7:25:16 | NotCompact | not implicit |
diff --git a/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected b/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected
index 3c7b45f500ee..d4b41c614413 100644
--- a/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected
+++ b/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected
@@ -1,5 +1,5 @@
-| Test.java:1:1:1:1 | <clinit> | in compact source |
-| Test.java:1:1:1:1 | <obinit> | in compact source |
+| Test.java:1:1:29:1 | <clinit> | in compact source |
+| Test.java:1:1:29:1 | <obinit> | in compact source |
 | Test.java:5:6:5:9 | main | in compact source |
 | Test.java:11:6:11:16 | processData | in compact source |
 | Test.java:16:14:16:31 | updatePrivateField | in compact source |
diff --git a/java/ql/test/library-tests/compact-source-files/options b/java/ql/test/library-tests/compact-source-files/options
index db1dc01e53b7..3d6e630aa73e 100644
--- a/java/ql/test/library-tests/compact-source-files/options
+++ b/java/ql/test/library-tests/compact-source-files/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args --release 25 --enable-preview
+//semmle-extractor-options: --javac-args --release 25
diff --git a/java/ql/test/library-tests/constants/PrintAst.expected b/java/ql/test/library-tests/constants/PrintAst.expected
index 63d59f7287e6..6f28f65d1f18 100644
--- a/java/ql/test/library-tests/constants/PrintAst.expected
+++ b/java/ql/test/library-tests/constants/PrintAst.expected
@@ -80,6 +80,7 @@ constants/Initializers.java:
 #    8|       -1: [TypeAccess] int
 #   10|     6: [Constructor] Initializers
 #   10|       5: [BlockStmt] { ... }
+#   10|         0: [SuperConstructorInvocationStmt] super(...)
 #   12|         2: [ExprStmt] <Expr>;
 #   12|           0: [AssignExpr] ...=...
 #   12|             0: [VarAccess] IFIELD2
diff --git a/java/ql/test/library-tests/constructors/ConstructorCalls.expected b/java/ql/test/library-tests/constructors/ConstructorCalls.expected
index 78c0b27019ce..345c61f89c30 100644
--- a/java/ql/test/library-tests/constructors/ConstructorCalls.expected
+++ b/java/ql/test/library-tests/constructors/ConstructorCalls.expected
@@ -1,3 +1,3 @@
 | constructors/A.java:5:3:5:11 | this(...) |
-| constructors/A.java:8:2:8:2 | super(...) |
+| constructors/A.java:8:11:8:11 | super(...) |
 | constructors/A.java:11:3:11:9 | new A(...) |
diff --git a/java/ql/test/library-tests/constructors/PrintAst.expected b/java/ql/test/library-tests/constructors/PrintAst.expected
index 2e8ca4999469..1905286c905a 100644
--- a/java/ql/test/library-tests/constructors/PrintAst.expected
+++ b/java/ql/test/library-tests/constructors/PrintAst.expected
@@ -10,6 +10,7 @@ constructors/A.java:
 #    8|         0: [Parameter] i
 #    8|           0: [TypeAccess] int
 #    8|       5: [BlockStmt] { ... }
+#    8|         0: [SuperConstructorInvocationStmt] super(...)
 #   10|     5: [Method] main
 #   10|       3: [TypeAccess] void
 #-----|       4: (Parameters)
diff --git a/java/ql/test/library-tests/dataflow/kdf/options b/java/ql/test/library-tests/dataflow/kdf/options
index f4edc64c0178..801b81e07526 100644
--- a/java/ql/test/library-tests/dataflow/kdf/options
+++ b/java/ql/test/library-tests/dataflow/kdf/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args --enable-preview --release 25
\ No newline at end of file
+//semmle-extractor-options: --javac-args --release 25
\ No newline at end of file
diff --git a/java/ql/test/library-tests/dataflow/scoped-values/options b/java/ql/test/library-tests/dataflow/scoped-values/options
index c793109355a5..2d42b8d2cd8d 100644
--- a/java/ql/test/library-tests/dataflow/scoped-values/options
+++ b/java/ql/test/library-tests/dataflow/scoped-values/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -source 25 -target 25 --enable-preview
\ No newline at end of file
+//semmle-extractor-options: --javac-args -source 25 -target 25
\ No newline at end of file
diff --git a/java/ql/test/library-tests/errorexpr/CONSISTENCY/diags.expected b/java/ql/test/library-tests/errorexpr/CONSISTENCY/diags.expected
new file mode 100644
index 000000000000..e3d57a5a9323
--- /dev/null
+++ b/java/ql/test/library-tests/errorexpr/CONSISTENCY/diags.expected
@@ -0,0 +1,2 @@
+unusedDiagnosticException
+| Test.java:16:1:16:95 | // Diagnostic Matches: In file Test.java:8:15 no end location for JCMethodInvocation : yield(x) |
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
index e8071db72f7d..aca631d4cfd0 100644
--- a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
@@ -6,6 +6,7 @@ FlexibleConstructors.java:
 #    2|         0: [Parameter] msg
 #    2|           0: [TypeAccess] String
 #    2|       5: [BlockStmt] { ... }
+#    2|         0: [SuperConstructorInvocationStmt] super(...)
 #    3|         1: [ExprStmt] <Expr>;
 #    3|           0: [MethodCall] println(...)
 #    3|             -1: [VarAccess] System.out
diff --git a/java/ql/test/library-tests/flexible-constructors/options b/java/ql/test/library-tests/flexible-constructors/options
index db1dc01e53b7..3d6e630aa73e 100644
--- a/java/ql/test/library-tests/flexible-constructors/options
+++ b/java/ql/test/library-tests/flexible-constructors/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args --release 25 --enable-preview
+//semmle-extractor-options: --javac-args --release 25
diff --git a/java/ql/test/library-tests/module-import-declarations/options b/java/ql/test/library-tests/module-import-declarations/options
index b510fdce0df9..801b81e07526 100644
--- a/java/ql/test/library-tests/module-import-declarations/options
+++ b/java/ql/test/library-tests/module-import-declarations/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args --release 25 --enable-preview
\ No newline at end of file
+//semmle-extractor-options: --javac-args --release 25
\ No newline at end of file
diff --git a/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected b/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected
index a6b5849eef68..f5fdf86d64f6 100644
--- a/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected
@@ -269,8 +269,8 @@
 | TestLoopBranch.java:109:9:109:22 | <obinit>(...) | TestLoopBranch.java:111:3:111:10 | <Expr>; |
 | TestLoopBranch.java:109:9:109:22 | Entry | TestLoopBranch.java:110:2:113:2 | { ... } |
 | TestLoopBranch.java:109:9:109:22 | Normal Exit | TestLoopBranch.java:109:9:109:22 | Exit |
-| TestLoopBranch.java:109:9:109:22 | super(...) | TestLoopBranch.java:109:9:109:22 | <Expr>; |
-| TestLoopBranch.java:110:2:113:2 | { ... } | TestLoopBranch.java:109:9:109:22 | super(...) |
+| TestLoopBranch.java:110:2:110:2 | super(...) | TestLoopBranch.java:109:9:109:22 | <Expr>; |
+| TestLoopBranch.java:110:2:113:2 | { ... } | TestLoopBranch.java:110:2:110:2 | super(...) |
 | TestLoopBranch.java:111:3:111:4 | xx | TestLoopBranch.java:111:8:111:9 | 33 |
 | TestLoopBranch.java:111:3:111:9 | ...=... | TestLoopBranch.java:112:3:112:10 | <Expr>; |
 | TestLoopBranch.java:111:3:111:10 | <Expr>; | TestLoopBranch.java:111:3:111:4 | xx |
@@ -283,8 +283,8 @@
 | TestLoopBranch.java:115:9:115:22 | <obinit>(...) | TestLoopBranch.java:117:3:117:9 | <Expr>; |
 | TestLoopBranch.java:115:9:115:22 | Entry | TestLoopBranch.java:116:2:119:2 | { ... } |
 | TestLoopBranch.java:115:9:115:22 | Normal Exit | TestLoopBranch.java:115:9:115:22 | Exit |
-| TestLoopBranch.java:115:9:115:22 | super(...) | TestLoopBranch.java:115:9:115:22 | <Expr>; |
-| TestLoopBranch.java:116:2:119:2 | { ... } | TestLoopBranch.java:115:9:115:22 | super(...) |
+| TestLoopBranch.java:116:2:116:2 | super(...) | TestLoopBranch.java:115:9:115:22 | <Expr>; |
+| TestLoopBranch.java:116:2:119:2 | { ... } | TestLoopBranch.java:116:2:116:2 | super(...) |
 | TestLoopBranch.java:117:3:117:4 | xx | TestLoopBranch.java:117:8:117:8 | i |
 | TestLoopBranch.java:117:3:117:8 | ...=... | TestLoopBranch.java:118:3:118:9 | <Expr>; |
 | TestLoopBranch.java:117:3:117:9 | <Expr>; | TestLoopBranch.java:117:3:117:4 | xx |
diff --git a/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected b/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected
index 3ed406a0a71a..5244bd8afa0b 100644
--- a/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected
@@ -1,7 +1,7 @@
 | TestThrow.java:7:10:7:18 | Entry | TestThrow.java:8:2:9:2 | { ... } |
 | TestThrow.java:7:10:7:18 | Normal Exit | TestThrow.java:7:10:7:18 | Exit |
-| TestThrow.java:7:10:7:18 | super(...) | TestThrow.java:7:10:7:18 | Normal Exit |
-| TestThrow.java:8:2:9:2 | { ... } | TestThrow.java:7:10:7:18 | super(...) |
+| TestThrow.java:8:2:8:2 | super(...) | TestThrow.java:7:10:7:18 | Normal Exit |
+| TestThrow.java:8:2:9:2 | { ... } | TestThrow.java:8:2:8:2 | super(...) |
 | TestThrow.java:11:15:11:21 | Entry | TestThrow.java:12:2:13:2 | { ... } |
 | TestThrow.java:11:15:11:21 | Normal Exit | TestThrow.java:11:15:11:21 | Exit |
 | TestThrow.java:12:2:13:2 | { ... } | TestThrow.java:11:15:11:21 | Normal Exit |