diff --git a/python/ql/test/library-tests/variables/scopes/free.expected b/python/ql/test/library-tests/variables/scopes/free.expected
index 3277eb55dd6..e379ea3fb47 100644
--- a/python/ql/test/library-tests/variables/scopes/free.expected
+++ b/python/ql/test/library-tests/variables/scopes/free.expected
@@ -1,9 +1,9 @@
-| Local Variable local2 | Function func2 | Function inner1 |
-| Local Variable local4 | Function func3 | Function inner2 |
-| Local Variable local4 | Function func3 | Function inner_outer |
-| Local Variable local5 | Function inner_outer | Function inner2 |
-| Local Variable param4 | Function func3 | Function inner2 |
-| Local Variable param4 | Function func3 | Function inner_outer |
-| Local Variable param5 | Function func3 | Function inner_outer |
-| Local Variable param6 | Function func4 | Function meth_inner |
-| Local Variable z | Function func6 | Function listcomp |
+| Local Variable local2 | test.py:15:1:15:12 | Function func2 | test.py:17:5:17:23 | Function inner1 |
+| Local Variable local4 | test.py:22:1:22:26 | Function func3 | test.py:24:5:24:22 | Function inner_outer |
+| Local Variable local4 | test.py:22:1:22:26 | Function func3 | test.py:25:9:25:27 | Function inner2 |
+| Local Variable local5 | test.py:24:5:24:22 | Function inner_outer | test.py:25:9:25:27 | Function inner2 |
+| Local Variable param4 | test.py:22:1:22:26 | Function func3 | test.py:24:5:24:22 | Function inner_outer |
+| Local Variable param4 | test.py:22:1:22:26 | Function func3 | test.py:25:9:25:27 | Function inner2 |
+| Local Variable param5 | test.py:22:1:22:26 | Function func3 | test.py:24:5:24:22 | Function inner_outer |
+| Local Variable param6 | test.py:38:1:38:18 | Function func4 | test.py:40:9:40:29 | Function meth_inner |
+| Local Variable z | test.py:47:1:47:16 | Function func6 | test.py:48:12:48:29 | Function listcomp |
diff --git a/python/ql/test/library-tests/variables/scopes/free.ql b/python/ql/test/library-tests/variables/scopes/free.ql
index cd5e0325de0..f396514e272 100644
--- a/python/ql/test/library-tests/variables/scopes/free.ql
+++ b/python/ql/test/library-tests/variables/scopes/free.ql
@@ -5,4 +5,4 @@ where
   v.escapes() and
   inner = v.getAnAccess().getScope() and
   inner != v.getScope()
-select v.toString(), v.getScope().toString(), inner.toString()
+select v, v.getScope(), inner
diff --git a/python/ql/test/library-tests/variables/scopes/globals.expected b/python/ql/test/library-tests/variables/scopes/globals.expected
index c0ed16f7582..78190eb199b 100644
--- a/python/ql/test/library-tests/variables/scopes/globals.expected
+++ b/python/ql/test/library-tests/variables/scopes/globals.expected
@@ -1,17 +1,17 @@
-| Global Variable C | Module test |
-| Global Variable __name__ | Module test |
-| Global Variable __package__ | Module test |
-| Global Variable base | Module test |
-| Global Variable func0 | Module test |
-| Global Variable func1 | Module test |
-| Global Variable func2 | Module test |
-| Global Variable func3 | Module test |
-| Global Variable func4 | Module test |
-| Global Variable func5 | Module test |
-| Global Variable func6 | Module test |
-| Global Variable global0 | Module test |
-| Global Variable global1 | Module test |
-| Global Variable global_local | Module test |
-| Global Variable range | Module test |
-| Global Variable seq | Module test |
-| Global Variable use_in_loop | Module test |
+| Global Variable C | test.py:0:0:0:0 | Module test |
+| Global Variable __name__ | test.py:0:0:0:0 | Module test |
+| Global Variable __package__ | test.py:0:0:0:0 | Module test |
+| Global Variable base | test.py:0:0:0:0 | Module test |
+| Global Variable func0 | test.py:0:0:0:0 | Module test |
+| Global Variable func1 | test.py:0:0:0:0 | Module test |
+| Global Variable func2 | test.py:0:0:0:0 | Module test |
+| Global Variable func3 | test.py:0:0:0:0 | Module test |
+| Global Variable func4 | test.py:0:0:0:0 | Module test |
+| Global Variable func5 | test.py:0:0:0:0 | Module test |
+| Global Variable func6 | test.py:0:0:0:0 | Module test |
+| Global Variable global0 | test.py:0:0:0:0 | Module test |
+| Global Variable global1 | test.py:0:0:0:0 | Module test |
+| Global Variable global_local | test.py:0:0:0:0 | Module test |
+| Global Variable range | test.py:0:0:0:0 | Module test |
+| Global Variable seq | test.py:0:0:0:0 | Module test |
+| Global Variable use_in_loop | test.py:0:0:0:0 | Module test |
diff --git a/python/ql/test/library-tests/variables/scopes/globals.ql b/python/ql/test/library-tests/variables/scopes/globals.ql
index 65e572c2ab4..903872eec7b 100644
--- a/python/ql/test/library-tests/variables/scopes/globals.ql
+++ b/python/ql/test/library-tests/variables/scopes/globals.ql
@@ -1,4 +1,4 @@
 import python
 
 from GlobalVariable l
-select l.toString(), l.getScope().toString()
+select l, l.getScope()
diff --git a/python/ql/test/library-tests/variables/scopes/lookup.expected b/python/ql/test/library-tests/variables/scopes/lookup.expected
index 2418f1d9283..379641ec743 100644
--- a/python/ql/test/library-tests/variables/scopes/lookup.expected
+++ b/python/ql/test/library-tests/variables/scopes/lookup.expected
@@ -1,34 +1,34 @@
-| 6 | ControlFlowNode for param0 | local |
-| 6 | ControlFlowNode for param1 | local |
-| 12 | ControlFlowNode for global_local | global |
-| 13 | ControlFlowNode for global1 | global |
-| 13 | ControlFlowNode for local0 | local |
-| 13 | ControlFlowNode for local1 | local |
-| 18 | ControlFlowNode for local2 | non-local |
-| 19 | ControlFlowNode for local3 | local |
-| 20 | ControlFlowNode for inner1 | local |
-| 26 | ControlFlowNode for local4 | non-local |
-| 26 | ControlFlowNode for local5 | non-local |
-| 26 | ControlFlowNode for param3 | local |
-| 26 | ControlFlowNode for param4 | non-local |
-| 28 | ControlFlowNode for inner2 | local |
-| 28 | ControlFlowNode for local4 | non-local |
-| 28 | ControlFlowNode for param4 | non-local |
-| 28 | ControlFlowNode for param5 | non-local |
-| 30 | ControlFlowNode for base | global |
-| 35 | ControlFlowNode for self | local |
-| 36 | ControlFlowNode for mlocal | local |
-| 41 | ControlFlowNode for param6 | non-local |
-| 42 | ControlFlowNode for Local | local |
-| 45 | ControlFlowNode for .0 | local |
-| 45 | ControlFlowNode for seq | local |
-| 45 | ControlFlowNode for x | local |
-| 48 | ControlFlowNode for .0 | local |
-| 48 | ControlFlowNode for seq | global |
-| 48 | ControlFlowNode for y | local |
-| 48 | ControlFlowNode for z | non-local |
-| 52 | ControlFlowNode for .0 | local |
-| 52 | ControlFlowNode for range | global |
-| 52 | ControlFlowNode for v | local |
-| 53 | ControlFlowNode for seq | local |
-| 54 | ControlFlowNode for v | local |
+| test.py:6:12:6:17 | ControlFlowNode for param0 | local |
+| test.py:6:21:6:26 | ControlFlowNode for param1 | local |
+| test.py:12:5:12:16 | ControlFlowNode for global_local | global |
+| test.py:13:15:13:20 | ControlFlowNode for local0 | local |
+| test.py:13:24:13:29 | ControlFlowNode for local1 | local |
+| test.py:13:33:13:39 | ControlFlowNode for global1 | global |
+| test.py:18:18:18:23 | ControlFlowNode for local2 | non-local |
+| test.py:19:16:19:21 | ControlFlowNode for local3 | local |
+| test.py:20:12:20:17 | ControlFlowNode for inner1 | local |
+| test.py:26:20:26:25 | ControlFlowNode for local5 | non-local |
+| test.py:26:29:26:34 | ControlFlowNode for local4 | non-local |
+| test.py:26:38:26:43 | ControlFlowNode for param3 | local |
+| test.py:26:47:26:52 | ControlFlowNode for param4 | non-local |
+| test.py:28:16:28:21 | ControlFlowNode for inner2 | local |
+| test.py:28:23:28:28 | ControlFlowNode for local4 | non-local |
+| test.py:28:32:28:37 | ControlFlowNode for param4 | non-local |
+| test.py:28:41:28:46 | ControlFlowNode for param5 | non-local |
+| test.py:30:9:30:12 | ControlFlowNode for base | global |
+| test.py:35:18:35:21 | ControlFlowNode for self | local |
+| test.py:36:16:36:21 | ControlFlowNode for mlocal | local |
+| test.py:41:20:41:25 | ControlFlowNode for param6 | non-local |
+| test.py:42:12:42:16 | ControlFlowNode for Local | local |
+| test.py:45:12:45:27 | ControlFlowNode for .0 | local |
+| test.py:45:13:45:13 | ControlFlowNode for x | local |
+| test.py:45:24:45:26 | ControlFlowNode for seq | local |
+| test.py:48:12:48:29 | ControlFlowNode for .0 | local |
+| test.py:48:13:48:13 | ControlFlowNode for y | local |
+| test.py:48:15:48:15 | ControlFlowNode for z | non-local |
+| test.py:48:26:48:28 | ControlFlowNode for seq | global |
+| test.py:52:5:52:25 | ControlFlowNode for .0 | local |
+| test.py:52:6:52:6 | ControlFlowNode for v | local |
+| test.py:52:17:52:21 | ControlFlowNode for range | global |
+| test.py:53:14:53:16 | ControlFlowNode for seq | local |
+| test.py:54:9:54:9 | ControlFlowNode for v | local |
diff --git a/python/ql/test/library-tests/variables/scopes/lookup.ql b/python/ql/test/library-tests/variables/scopes/lookup.ql
index 84dfaac48b5..03368dff847 100644
--- a/python/ql/test/library-tests/variables/scopes/lookup.ql
+++ b/python/ql/test/library-tests/variables/scopes/lookup.ql
@@ -15,4 +15,4 @@ where
     not n.isNonLocal() and
     l = "none"
   )
-select n.getLocation().getStartLine(), n.toString(), l
+select n, l