diff --git a/java/ql/test/kotlin/library-tests/trap/diags.expected b/java/ql/test/kotlin/library-tests/trap/diags.expected
index 10d65f6c31a..65e1bb8e665 100644
--- a/java/ql/test/kotlin/library-tests/trap/diags.expected
+++ b/java/ql/test/kotlin/library-tests/trap/diags.expected
@@ -1,9 +1,9 @@
-| file://:0:0:0:0 | Truncated string of length 1048577 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048577 | [DATE TIME K] Truncated string of length 1048577\nTruncated string of length 1048577, starting '//A03BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDE'  ...while extracting a file (long_comments.kt) at long_comments.kt:1:1:19:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048577 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048577 | [DATE TIME K] Truncated string of length 1048577\nTruncated string of length 1048577, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDE'  ...while extracting a expression (<no name>) at long_string.kt:16:31:16:1048607\n  ...while extracting a variable expr (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a variable (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a statement (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048577 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048577 | [DATE TIME K] Truncated string of length 1048577\nTruncated string of length 1048577, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDE'  ...while extracting a expression (<no name>) at long_string.kt:16:31:16:1048607\n  ...while extracting a variable expr (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a variable (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a statement (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | [DATE TIME K] Truncated string of length 1048578\nTruncated string of length 1048578, starting '//A04BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDEF'  ...while extracting a file (long_comments.kt) at long_comments.kt:1:1:19:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | [DATE TIME K] Truncated string of length 1048578\nTruncated string of length 1048578, starting '//A05"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""', ending '""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""CDEF'  ...while extracting a file (long_comments.kt) at long_comments.kt:1:1:19:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | [DATE TIME K] Truncated string of length 1048578\nTruncated string of length 1048578, starting 'A"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""', ending '""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""CDEF'  ...while extracting a expression (<no name>) at long_string.kt:18:31:18:2097181\n  ...while extracting a variable expr (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a variable (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a statement (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | [DATE TIME K] Truncated string of length 1048578\nTruncated string of length 1048578, starting 'A"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""', ending '""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""CDEF'  ...while extracting a expression (<no name>) at long_string.kt:18:31:18:2097181\n  ...while extracting a variable expr (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a variable (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a statement (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | [DATE TIME K] Truncated string of length 1048578\nTruncated string of length 1048578, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDEF'  ...while extracting a expression (<no name>) at long_string.kt:17:31:17:1048608\n  ...while extracting a variable expr (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a variable (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a statement (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
-| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | [DATE TIME K] Truncated string of length 1048578\nTruncated string of length 1048578, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDEF'  ...while extracting a expression (<no name>) at long_string.kt:17:31:17:1048608\n  ...while extracting a variable expr (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a variable (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a statement (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048577 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048577 | DATE TIME Truncated string of length 1048577\nTruncated string of length 1048577, starting '//A03BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDE'  ...while extracting a file (long_comments.kt) at long_comments.kt:1:1:19:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048577 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048577 | DATE TIME Truncated string of length 1048577\nTruncated string of length 1048577, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDE'  ...while extracting a expression (<no name>) at long_string.kt:16:31:16:1048607\n  ...while extracting a variable expr (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a variable (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a statement (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048577 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048577 | DATE TIME Truncated string of length 1048577\nTruncated string of length 1048577, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDE'  ...while extracting a expression (<no name>) at long_string.kt:16:31:16:1048607\n  ...while extracting a variable expr (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a variable (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a statement (longStringLiteral3) at long_string.kt:16:5:16:1048608\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | DATE TIME Truncated string of length 1048578\nTruncated string of length 1048578, starting '//A04BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDEF'  ...while extracting a file (long_comments.kt) at long_comments.kt:1:1:19:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | DATE TIME Truncated string of length 1048578\nTruncated string of length 1048578, starting '//A05"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""', ending '""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""CDEF'  ...while extracting a file (long_comments.kt) at long_comments.kt:1:1:19:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | DATE TIME Truncated string of length 1048578\nTruncated string of length 1048578, starting 'A"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""', ending '""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""CDEF'  ...while extracting a expression (<no name>) at long_string.kt:18:31:18:2097181\n  ...while extracting a variable expr (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a variable (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a statement (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | DATE TIME Truncated string of length 1048578\nTruncated string of length 1048578, starting 'A"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""', ending '""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""CDEF'  ...while extracting a expression (<no name>) at long_string.kt:18:31:18:2097181\n  ...while extracting a variable expr (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a variable (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a statement (longStringLiteral5) at long_string.kt:18:5:18:2097182\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | DATE TIME Truncated string of length 1048578\nTruncated string of length 1048578, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDEF'  ...while extracting a expression (<no name>) at long_string.kt:17:31:17:1048608\n  ...while extracting a variable expr (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a variable (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a statement (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
+| file://:0:0:0:0 | Truncated string of length 1048578 | CodeQL Kotlin extractor | 2 |  | Truncated string of length 1048578 | DATE TIME Truncated string of length 1048578\nTruncated string of length 1048578, starting 'ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', ending 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCDEF'  ...while extracting a expression (<no name>) at long_string.kt:17:31:17:1048608\n  ...while extracting a variable expr (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a variable (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a statement (longStringLiteral4) at long_string.kt:17:5:17:1048609\n  ...while extracting a block body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a body (<no name>) at long_string.kt:13:22:19:1\n  ...while extracting a function (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a declaration (longLiteralFun) at long_string.kt:13:1:19:1\n  ...while extracting a file (long_string.kt) at long_string.kt:1:1:21:0\n |
diff --git a/java/ql/test/kotlin/library-tests/trap/diags.ql b/java/ql/test/kotlin/library-tests/trap/diags.ql
index b15d472831b..0093ee7a62b 100644
--- a/java/ql/test/kotlin/library-tests/trap/diags.ql
+++ b/java/ql/test/kotlin/library-tests/trap/diags.ql
@@ -3,5 +3,5 @@ import semmle.code.java.Diagnostics
 from Diagnostic d
 select d, d.getGeneratedBy(), d.getSeverity(), d.getTag(), d.getMessage(),
   d.getFullMessage()
-      .regexpReplaceAll("^\\[[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} K\\] ",
-        "[DATE TIME K] ")
+      .regexpReplaceAll("^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} ",
+        "DATE TIME ")