diff --git a/testsuite/tests/gnatcheck/import_paths/test.out b/testsuite/tests/gnatcheck/import_paths/test.out
index bc2de6714..460aaa39e 100644
--- a/testsuite/tests/gnatcheck/import_paths/test.out
+++ b/testsuite/tests/gnatcheck/import_paths/test.out
@@ -24,7 +24,7 @@ main.adb:1:11: bar
 main.adb:1:18: bar
 main.adb:2:06: bar
 main.adb:3:04: bar
-main.adb:3:08: bar
+main.adb:3:09: bar
 main.adb:4:05: bar
 main.adb:4:10: bar
 
diff --git a/testsuite/tests/gnatcheck_errors/lkql_error/test.out b/testsuite/tests/gnatcheck_errors/lkql_error/test.out
index 9580b2a7b..c58bc26f1 100644
--- a/testsuite/tests/gnatcheck_errors/lkql_error/test.out
+++ b/testsuite/tests/gnatcheck_errors/lkql_error/test.out
@@ -38,7 +38,7 @@ main.adb:1:11: error: internal issue at foo.lkql:4:17: Null receiver in dot acce
 main.adb:1:18: error: internal issue at foo.lkql:4:17: Null receiver in dot access [foo]
 main.adb:2:06: error: internal issue at foo.lkql:4:17: Null receiver in dot access [foo]
 main.adb:3:04: error: internal issue at foo.lkql:4:17: Null receiver in dot access [foo]
-main.adb:3:08: error: internal issue at foo.lkql:4:17: Null receiver in dot access [foo]
+main.adb:3:09: error: internal issue at foo.lkql:4:17: Null receiver in dot access [foo]
 main.adb:4:05: error: internal issue at foo.lkql:4:17: Null receiver in dot access [foo]
 main.adb:4:10: error: internal issue at foo.lkql:4:17: Null receiver in dot access [foo]
 
diff --git a/testsuite/tests/interpreter/not_pattern/test.out b/testsuite/tests/interpreter/not_pattern/test.out
index 8e9348626..c33e343fa 100644
--- a/testsuite/tests/interpreter/not_pattern/test.out
+++ b/testsuite/tests/interpreter/not_pattern/test.out
@@ -1 +1 @@
-[<CompilationUnit main.adb:1:1-8:10>, <AdaNodeList main.adb:1:1-1:35>, <WithClause main.adb:1:1-1:18>, <LimitedAbsent main.adb:1:1-1:1>, <PrivateAbsent main.adb:1:1-1:1>, <NameList main.adb:1:6-1:17>, <DottedName main.adb:1:6-1:17>, <Id "Ada" main.adb:1:6-1:9>, <Id "Text_IO" main.adb:1:10-1:17>, <UsePackageClause main.adb:1:19-1:35>, <NameList main.adb:1:23-1:34>, <DottedName main.adb:1:23-1:34>, <Id "Ada" main.adb:1:23-1:26>, <Id "Text_IO" main.adb:1:27-1:34>, <LibraryItem main.adb:3:1-8:10>, <PrivateAbsent main.adb:1:35-1:35>, <SubpBody ["Main"] main.adb:3:1-8:10>, <OverridingUnspecified main.adb:1:35-1:35>, <SubpSpec main.adb:3:1-3:15>, <SubpKindProcedure main.adb:3:1-3:10>, <DefiningName "Main" main.adb:3:11-3:15>, <Id "Main" main.adb:3:11-3:15>, <DeclarativePart main.adb:3:18-6:1>, <AdaNodeList main.adb:4:4-5:66>, <DefiningNameList main.adb:4:4-4:11>, <DefiningName "Message" main.adb:4:4-4:11>, <Id "Message" main.adb:4:4-4:11>, <AliasedAbsent main.adb:4:21-4:21>, <ConstantAbsent main.adb:4:21-4:21>, <ModeDefault main.adb:4:21-4:21>, <SubtypeIndication main.adb:4:22-4:28>, <NotNullAbsent main.adb:4:21-4:21>, <Id "String" main.adb:4:22-4:28>, <Str ""Hello World !"" main.adb:4:32-4:47>, <DefiningNameList main.adb:5:4-5:19>, <DefiningName "ConstantMessage" main.adb:5:4-5:19>, <Id "ConstantMessage" main.adb:5:4-5:19>, <AliasedAbsent main.adb:5:21-5:21>, <ConstantPresent main.adb:5:22-5:30>, <ModeDefault main.adb:5:30-5:30>, <SubtypeIndication main.adb:5:31-5:37>, <NotNullAbsent main.adb:5:30-5:30>, <Id "String" main.adb:5:31-5:37>, <Str ""Hello Constant world !"" main.adb:5:41-5:65>, <HandledStmts main.adb:6:6-8:1>, <StmtList main.adb:7:4-7:23>, <CallStmt main.adb:7:4-7:23>, <Id "Put_Line" main.adb:7:4-7:12>, <AssocList main.adb:7:14-7:21>, <ParamAssoc main.adb:7:14-7:21>, <Id "Message" main.adb:7:14-7:21>, <AdaNodeList main.adb:7:22-7:22>, <EndName main.adb:8:5-8:9>, <Id "Main" main.adb:8:5-8:9>, <PragmaNodeList main.adb:8:10-8:10>]
+[<CompilationUnit main.adb:1:1-8:10>, <AdaNodeList main.adb:1:1-1:35>, <WithClause main.adb:1:1-1:18>, <LimitedAbsent main.adb:1:1-1:1>, <PrivateAbsent main.adb:1:1-1:1>, <NameList main.adb:1:6-1:17>, <DottedName main.adb:1:6-1:17>, <Id "Ada" main.adb:1:6-1:9>, <Id "Text_IO" main.adb:1:10-1:17>, <UsePackageClause main.adb:1:19-1:35>, <NameList main.adb:1:23-1:34>, <DottedName main.adb:1:23-1:34>, <Id "Ada" main.adb:1:23-1:26>, <Id "Text_IO" main.adb:1:27-1:34>, <LibraryItem main.adb:3:1-8:10>, <PrivateAbsent main.adb:1:35-1:35>, <SubpBody ["Main"] main.adb:3:1-8:10>, <OverridingUnspecified main.adb:1:35-1:35>, <SubpSpec main.adb:3:1-3:15>, <SubpKindProcedure main.adb:3:1-3:10>, <DefiningName "Main" main.adb:3:11-3:15>, <Id "Main" main.adb:3:11-3:15>, <DeclarativePart main.adb:3:18-6:1>, <AdaNodeList main.adb:4:4-5:66>, <DefiningNameList main.adb:4:4-4:11>, <DefiningName "Message" main.adb:4:4-4:11>, <Id "Message" main.adb:4:4-4:11>, <AliasedAbsent main.adb:4:21-4:21>, <ConstantAbsent main.adb:4:21-4:21>, <ModeDefault main.adb:4:21-4:21>, <SubtypeIndication main.adb:4:22-4:28>, <NotNullAbsent main.adb:4:21-4:21>, <Id "String" main.adb:4:22-4:28>, <Str ""Hello World !"" main.adb:4:32-4:47>, <DefiningNameList main.adb:5:4-5:19>, <DefiningName "ConstantMessage" main.adb:5:4-5:19>, <Id "ConstantMessage" main.adb:5:4-5:19>, <AliasedAbsent main.adb:5:21-5:21>, <ConstantPresent main.adb:5:22-5:30>, <ModeDefault main.adb:5:30-5:30>, <SubtypeIndication main.adb:5:31-5:37>, <NotNullAbsent main.adb:5:30-5:30>, <Id "String" main.adb:5:31-5:37>, <Str ""Hello Constant world !"" main.adb:5:41-5:65>, <HandledStmts main.adb:6:6-8:1>, <StmtList main.adb:7:4-7:23>, <CallStmt main.adb:7:4-7:23>, <Id "Put_Line" main.adb:7:4-7:12>, <AssocList main.adb:7:14-7:21>, <ParamAssoc main.adb:7:14-7:21>, <Id "Message" main.adb:7:14-7:21>, <AdaNodeList main.adb:7:23-7:23>, <EndName main.adb:8:5-8:9>, <Id "Main" main.adb:8:5-8:9>, <PragmaNodeList main.adb:8:10-8:10>]
diff --git a/testsuite/tests/interpreter/quantified_selector/test.out b/testsuite/tests/interpreter/quantified_selector/test.out
index 496c54f4f..430aacd7b 100644
--- a/testsuite/tests/interpreter/quantified_selector/test.out
+++ b/testsuite/tests/interpreter/quantified_selector/test.out
@@ -1 +1 @@
-[<AdaNodeList main.adb:4:4-5:66>, <AdaNodeList main.adb:7:22-7:22>]
+[<AdaNodeList main.adb:4:4-5:66>, <AdaNodeList main.adb:7:23-7:23>]
diff --git a/testsuite/tests/interpreter/to_list/test.out b/testsuite/tests/interpreter/to_list/test.out
index 8951fba1b..040ebafc0 100644
--- a/testsuite/tests/interpreter/to_list/test.out
+++ b/testsuite/tests/interpreter/to_list/test.out
@@ -1,3 +1,3 @@
 [1, 2, 3, 4]
 [2, 4, 6, 8]
-[<OverridingUnspecified main.adb:1:35-1:35>, <SubpSpec main.adb:3:1-3:15>, null, <DeclarativePart main.adb:3:18-6:1>, <HandledStmts main.adb:6:6-8:1>, <EndName main.adb:8:5-8:9>, <SubpKindProcedure main.adb:3:1-3:10>, <DefiningName "Main" main.adb:3:11-3:15>, null, null, <AdaNodeList main.adb:4:4-5:66>, <StmtList main.adb:7:4-7:23>, <AdaNodeList main.adb:7:22-7:22>, <Id "Main" main.adb:8:5-8:9>, <Id "Main" main.adb:3:11-3:15>, <ObjectDecl ["Message"] main.adb:4:4-4:48>, <ObjectDecl ["ConstantMessage"] main.adb:5:4-5:66>, <CallStmt main.adb:7:4-7:23>, <DefiningNameList main.adb:4:4-4:11>, <AliasedAbsent main.adb:4:21-4:21>, <ConstantAbsent main.adb:4:21-4:21>, <ModeDefault main.adb:4:21-4:21>, <SubtypeIndication main.adb:4:22-4:28>, <Str ""Hello World !"" main.adb:4:32-4:47>, null, null, <DefiningNameList main.adb:5:4-5:19>, <AliasedAbsent main.adb:5:21-5:21>, <ConstantPresent main.adb:5:22-5:30>, <ModeDefault main.adb:5:30-5:30>, <SubtypeIndication main.adb:5:31-5:37>, <Str ""Hello Constant world !"" main.adb:5:41-5:65>, null, null, <CallExpr main.adb:7:4-7:22>, <DefiningName "Message" main.adb:4:4-4:11>, <NotNullAbsent main.adb:4:21-4:21>, <Id "String" main.adb:4:22-4:28>, null, <DefiningName "ConstantMessage" main.adb:5:4-5:19>, <NotNullAbsent main.adb:5:30-5:30>, <Id "String" main.adb:5:31-5:37>, null, <Id "Put_Line" main.adb:7:4-7:12>, <AssocList main.adb:7:14-7:21>, <Id "Message" main.adb:4:4-4:11>, <Id "ConstantMessage" main.adb:5:4-5:19>, <ParamAssoc main.adb:7:14-7:21>, null, <Id "Message" main.adb:7:14-7:21>]
+[<OverridingUnspecified main.adb:1:35-1:35>, <SubpSpec main.adb:3:1-3:15>, null, <DeclarativePart main.adb:3:18-6:1>, <HandledStmts main.adb:6:6-8:1>, <EndName main.adb:8:5-8:9>, <SubpKindProcedure main.adb:3:1-3:10>, <DefiningName "Main" main.adb:3:11-3:15>, null, null, <AdaNodeList main.adb:4:4-5:66>, <StmtList main.adb:7:4-7:23>, <AdaNodeList main.adb:7:23-7:23>, <Id "Main" main.adb:8:5-8:9>, <Id "Main" main.adb:3:11-3:15>, <ObjectDecl ["Message"] main.adb:4:4-4:48>, <ObjectDecl ["ConstantMessage"] main.adb:5:4-5:66>, <CallStmt main.adb:7:4-7:23>, <DefiningNameList main.adb:4:4-4:11>, <AliasedAbsent main.adb:4:21-4:21>, <ConstantAbsent main.adb:4:21-4:21>, <ModeDefault main.adb:4:21-4:21>, <SubtypeIndication main.adb:4:22-4:28>, <Str ""Hello World !"" main.adb:4:32-4:47>, null, null, <DefiningNameList main.adb:5:4-5:19>, <AliasedAbsent main.adb:5:21-5:21>, <ConstantPresent main.adb:5:22-5:30>, <ModeDefault main.adb:5:30-5:30>, <SubtypeIndication main.adb:5:31-5:37>, <Str ""Hello Constant world !"" main.adb:5:41-5:65>, null, null, <CallExpr main.adb:7:4-7:22>, <DefiningName "Message" main.adb:4:4-4:11>, <NotNullAbsent main.adb:4:21-4:21>, <Id "String" main.adb:4:22-4:28>, null, <DefiningName "ConstantMessage" main.adb:5:4-5:19>, <NotNullAbsent main.adb:5:30-5:30>, <Id "String" main.adb:5:31-5:37>, null, <Id "Put_Line" main.adb:7:4-7:12>, <AssocList main.adb:7:14-7:21>, <Id "Message" main.adb:4:4-4:11>, <Id "ConstantMessage" main.adb:5:4-5:19>, <ParamAssoc main.adb:7:14-7:21>, null, <Id "Message" main.adb:7:14-7:21>]