diff --git a/cpp/ql/test/library-tests/ptr_to_member/segfault/exprs.expected b/cpp/ql/test/library-tests/ptr_to_member/segfault/exprs.expected
index e745ca0142d..e5539a762ab 100644
--- a/cpp/ql/test/library-tests/ptr_to_member/segfault/exprs.expected
+++ b/cpp/ql/test/library-tests/ptr_to_member/segfault/exprs.expected
@@ -1,7 +1,7 @@
-| file://:0:0:0:0 | Unknown literal | file://:0:0:0:0 | unsigned long |
-| file://:0:0:0:0 | Unknown literal | file://:0:0:0:0 | unsigned long |
-| file://:0:0:0:0 | Unknown literal | file://:0:0:0:0 | unsigned long |
-| file://:0:0:0:0 | Unknown literal | file://:0:0:0:0 | unsigned long |
+| file://:0:0:0:0 | __i | file://:0:0:0:0 | unsigned long |
+| file://:0:0:0:0 | uls | file://:0:0:0:0 | unsigned long |
+| file://:0:0:0:0 | uls | file://:0:0:0:0 | unsigned long |
+| file://:0:0:0:0 | uls | file://:0:0:0:0 | unsigned long |
 | segfault.cpp:25:46:25:65 | call to S | file://:0:0:0:0 | void |
 | segfault.cpp:25:46:25:65 | call to S | file://:0:0:0:0 | void |
 | segfault.cpp:25:48:25:55 | __second | segfault.cpp:15:7:15:11 | tuple |
diff --git a/cpp/ql/test/library-tests/templates/CPP-204/element.expected b/cpp/ql/test/library-tests/templates/CPP-204/element.expected
index b1662c2a3b3..44384471af9 100644
--- a/cpp/ql/test/library-tests/templates/CPP-204/element.expected
+++ b/cpp/ql/test/library-tests/templates/CPP-204/element.expected
@@ -1,12 +1,12 @@
 | file://:0:0:0:0 |  |
 | file://:0:0:0:0 | 0 |
 | file://:0:0:0:0 | (global namespace) |
-| file://:0:0:0:0 | Unknown literal |
-| file://:0:0:0:0 | Unknown literal |
-| file://:0:0:0:0 | Unknown literal |
-| file://:0:0:0:0 | Unknown literal |
-| file://:0:0:0:0 | Unknown literal |
-| file://:0:0:0:0 | Unknown literal |
+| file://:0:0:0:0 | B |
+| file://:0:0:0:0 | X |
+| file://:0:0:0:0 | X |
+| file://:0:0:0:0 | X |
+| file://:0:0:0:0 | X |
+| file://:0:0:0:0 | Y |
 | file://:0:0:0:0 | __va_list_tag |
 | file://:0:0:0:0 | __va_list_tag & |
 | file://:0:0:0:0 | __va_list_tag && |
diff --git a/cpp/ql/test/library-tests/templates/nontype_instantiations/classes/test.expected b/cpp/ql/test/library-tests/templates/nontype_instantiations/classes/test.expected
index 524097b88d6..ffa9bfb2cf4 100644
--- a/cpp/ql/test/library-tests/templates/nontype_instantiations/classes/test.expected
+++ b/cpp/ql/test/library-tests/templates/nontype_instantiations/classes/test.expected
@@ -1,2 +1,2 @@
 | test.cpp:2:7:2:9 | Int<10> | file://:0:0:0:0 | int | test.cpp:4:5:4:6 | 10 |
-| test.cpp:2:7:2:9 | Int<i> | file://:0:0:0:0 | int | file://:0:0:0:0 | Unknown literal |
+| test.cpp:2:7:2:9 | Int<i> | file://:0:0:0:0 | int | file://:0:0:0:0 | i |
diff --git a/cpp/ql/test/library-tests/templates/nontype_instantiations/functions/test.expected b/cpp/ql/test/library-tests/templates/nontype_instantiations/functions/test.expected
index 70e845e7b59..493e9f03b20 100644
--- a/cpp/ql/test/library-tests/templates/nontype_instantiations/functions/test.expected
+++ b/cpp/ql/test/library-tests/templates/nontype_instantiations/functions/test.expected
@@ -1,2 +1,2 @@
 | test.cpp:3:5:3:5 | addToSelf | file://:0:0:0:0 | int | test.cpp:5:30:5:31 | 10 |
-| test.cpp:3:5:3:13 | addToSelf | file://:0:0:0:0 | int | file://:0:0:0:0 | Unknown literal |
+| test.cpp:3:5:3:13 | addToSelf | file://:0:0:0:0 | int | file://:0:0:0:0 | i |