From 2321ca59f6d64ba0e8e88131bc1d28ceb86249e9 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 11 Dec 2024 13:29:16 +0100
Subject: [PATCH] Python: Update all test util paths to point to the new
 location.

---
 .../ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll  | 2 +-
 python/ql/src/utils/test/dataflow/DataflowQueryTest.qll       | 2 +-
 python/ql/src/utils/test/dataflow/FlowTest.qll                | 2 +-
 python/ql/src/utils/test/dataflow/NormalDataflowTest.qll      | 4 ++--
 python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll | 4 ++--
 python/ql/src/utils/test/dataflow/RoutingTest.qll             | 2 +-
 python/ql/src/utils/test/dataflow/UnresolvedCalls.qll         | 2 +-
 python/ql/test/experimental/import-resolution/importflow.ql   | 2 +-
 python/ql/test/experimental/import-resolution/imports.ql      | 2 +-
 .../library-tests/CallGraph/InlineCallGraphTest.ql            | 2 +-
 python/ql/test/experimental/meta/ConceptsTest.qll             | 2 +-
 python/ql/test/experimental/meta/InlineTaintTest.qll          | 2 +-
 python/ql/test/experimental/meta/MaDTest.qll                  | 2 +-
 python/ql/test/experimental/meta/RemoteFlowSourceTest.qll     | 2 +-
 python/ql/test/experimental/meta/debug/dataflowTestPaths.ql   | 2 +-
 .../Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql     | 2 +-
 .../Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql   | 2 +-
 .../CWE-074-RemoteCommandExecution/DataflowQueryTest.ql       | 2 +-
 .../query-tests/Security/CWE-409/DataflowQueryTest.ql         | 2 +-
 python/ql/test/library-tests/ApiGraphs/py2/use.ql             | 2 +-
 python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql | 2 +-
 python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql | 2 +-
 .../InlineExpectationsTest/missing-relevant-tag/Test.ql       | 2 +-
 python/ql/test/library-tests/dataflow/basic/callGraph.ql      | 2 +-
 python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql | 2 +-
 .../ql/test/library-tests/dataflow/basic/callGraphSources.ql  | 2 +-
 .../ql/test/library-tests/dataflow/basic/localFlowStepTest.ql | 2 +-
 .../ql/test/library-tests/dataflow/basic/maximalFlowTest.ql   | 2 +-
 .../ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql  | 2 +-
 .../library-tests/dataflow/coverage/NormalDataflowTest.ql     | 2 +-
 .../library-tests/dataflow/coverage/argumentRoutingTest.ql    | 2 +-
 .../library-tests/dataflow/exceptions/NormalDataflowTest.ql   | 2 +-
 .../library-tests/dataflow/fieldflow/NormalDataflowTest.ql    | 2 +-
 .../test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql  | 2 +-
 python/ql/test/library-tests/dataflow/global-flow/accesses.ql | 2 +-
 .../test/library-tests/dataflow/match/NormalDataflowTest.ql   | 2 +-
 .../dataflow/model-summaries/NormalDataflowTest.ql            | 2 +-
 .../library-tests/dataflow/module-initialization/localFlow.ql | 2 +-
 python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql | 4 ++--
 python/ql/test/library-tests/dataflow/regression/dataflow.ql  | 2 +-
 .../dataflow/sensitive-data/TestSensitiveDataSources.ql       | 2 +-
 .../dataflow/summaries/NormalTaintTrackingTest.ql             | 2 +-
 python/ql/test/library-tests/dataflow/summaries/summaries.ql  | 2 +-
 .../tainttracking/generator-flow/NormalDataflowTest.ql        | 2 +-
 .../library-tests/dataflow/typetracking-summaries/tracked.ql  | 2 +-
 python/ql/test/library-tests/dataflow/typetracking/tracked.ql | 2 +-
 .../library-tests/dataflow/variable-capture/CaptureTest.ql    | 4 ++--
 python/ql/test/library-tests/essa/ssa-compute/UseUse.ql       | 2 +-
 .../library-tests/frameworks/django-orm/NormalDataflowTest.ql | 2 +-
 .../internal-ql-helpers/PoorMansFunctionResolutionTest.ql     | 2 +-
 python/ql/test/library-tests/regex/SubstructureTests.ql       | 2 +-
 python/ql/test/library-tests/regexparser/Locations.ql         | 2 +-
 .../Functions/ModificationOfParameterWithDefault/test.ql      | 2 +-
 python/ql/test/query-tests/Numerics/Pythagorean.qlref         | 2 +-
 .../Security/CWE-022-PathInjection/DataflowQueryTest.ql       | 2 +-
 .../Security/CWE-078-CommandInjection/DataflowQueryTest.ql    | 2 +-
 .../DataflowQueryTest.ql                                      | 2 +-
 .../Security/CWE-094-CodeInjection/CodeInjection.qlref        | 2 +-
 .../Security/CWE-209-StackTraceExposure/ExceptionInfo.ql      | 2 +-
 .../Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql      | 2 +-
 60 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll b/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll
index 76cd0a37822..787aaaeee8c 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll
@@ -55,7 +55,7 @@ string prettyNode(DataFlow::Node node) {
  * INTERNAL: Do not use.
  *
  * Gets the pretty-printed version of the DataFlow::Node `node`, that is suitable for use
- * with `TestUtilities.InlineExpectationsTest` (that is, no spaces unless required).
+ * with `utils.test.InlineExpectationsTest` (that is, no spaces unless required).
  */
 bindingset[node]
 string prettyNodeForInlineTest(DataFlow::Node node) {
diff --git a/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll b/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll
index e9f13aaaa47..bc3969310b4 100644
--- a/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll
+++ b/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 
 signature module QueryTestSig {
diff --git a/python/ql/src/utils/test/dataflow/FlowTest.qll b/python/ql/src/utils/test/dataflow/FlowTest.qll
index f2068ebe723..17bbe9e0cff 100644
--- a/python/ql/src/utils/test/dataflow/FlowTest.qll
+++ b/python/ql/src/utils/test/dataflow/FlowTest.qll
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 
 signature module FlowTestSig {
diff --git a/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll b/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll
index b89738b100e..696b43d5f03 100644
--- a/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll
+++ b/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll
@@ -1,6 +1,6 @@
 import python
-import TestUtilities.dataflow.FlowTest
-import TestUtilities.dataflow.testConfig
+import utils.test.dataflow.FlowTest
+import utils.test.dataflow.testConfig
 private import semmle.python.dataflow.new.internal.PrintNode
 
 module DataFlowTest implements FlowTestSig {
diff --git a/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll b/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll
index e63e962df4d..753f8f61e13 100644
--- a/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll
+++ b/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll
@@ -1,6 +1,6 @@
 import python
-import TestUtilities.dataflow.FlowTest
-import TestUtilities.dataflow.testTaintConfig
+import utils.test.dataflow.FlowTest
+import utils.test.dataflow.testTaintConfig
 private import semmle.python.dataflow.new.internal.PrintNode
 
 module DataFlowTest implements FlowTestSig {
diff --git a/python/ql/src/utils/test/dataflow/RoutingTest.qll b/python/ql/src/utils/test/dataflow/RoutingTest.qll
index 6c2df0e4348..e7ac4e87247 100644
--- a/python/ql/src/utils/test/dataflow/RoutingTest.qll
+++ b/python/ql/src/utils/test/dataflow/RoutingTest.qll
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 
diff --git a/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll b/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll
index 9b26d8c9175..a4dfb07ee90 100644
--- a/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll
+++ b/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll
@@ -2,7 +2,7 @@ import python
 private import semmle.python.dataflow.new.internal.PrintNode
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 private import semmle.python.ApiGraphs
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 signature module UnresolvedCallExpectationsSig {
   predicate unresolvedCall(CallNode call);
diff --git a/python/ql/test/experimental/import-resolution/importflow.ql b/python/ql/test/experimental/import-resolution/importflow.ql
index 0398f1a7a69..a3e20123fc7 100644
--- a/python/ql/test/experimental/import-resolution/importflow.ql
+++ b/python/ql/test/experimental/import-resolution/importflow.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.ApiGraphs
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.dataflow.new.internal.ImportResolution
 
 /** A string that appears on the right hand side of an assignment. */
diff --git a/python/ql/test/experimental/import-resolution/imports.ql b/python/ql/test/experimental/import-resolution/imports.ql
index 48a8a411665..d2b436b560b 100644
--- a/python/ql/test/experimental/import-resolution/imports.ql
+++ b/python/ql/test/experimental/import-resolution/imports.ql
@@ -1,5 +1,5 @@
 import python
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.internal.ImportResolution
 
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
index 8c47bacfb88..1771727dbbc 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
@@ -1,5 +1,5 @@
 import python
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.DataFlowDispatch as TT
 
 /** Holds when `call` is resolved to `callable` using points-to based call-graph. */
diff --git a/python/ql/test/experimental/meta/ConceptsTest.qll b/python/ql/test/experimental/meta/ConceptsTest.qll
index 40aa9c951b0..658d11f7e85 100644
--- a/python/ql/test/experimental/meta/ConceptsTest.qll
+++ b/python/ql/test/experimental/meta/ConceptsTest.qll
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.Concepts
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 private import codeql.threatmodels.ThreatModels
 
diff --git a/python/ql/test/experimental/meta/InlineTaintTest.qll b/python/ql/test/experimental/meta/InlineTaintTest.qll
index a09cc9aabc1..525775d5106 100644
--- a/python/ql/test/experimental/meta/InlineTaintTest.qll
+++ b/python/ql/test/experimental/meta/InlineTaintTest.qll
@@ -13,7 +13,7 @@ import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.RemoteFlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 private import semmle.python.Concepts
 
diff --git a/python/ql/test/experimental/meta/MaDTest.qll b/python/ql/test/experimental/meta/MaDTest.qll
index 9b6bd59287a..705785d796c 100644
--- a/python/ql/test/experimental/meta/MaDTest.qll
+++ b/python/ql/test/experimental/meta/MaDTest.qll
@@ -5,7 +5,7 @@ private import semmle.python.frameworks.data.ModelsAsData
 // need to import Frameworks to get the actual modeling imported
 private import semmle.python.Frameworks
 // this import needs to be public to get the query predicates propagated to the actual test files
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module MadSinkTest implements TestSig {
   string getARelevantTag() {
diff --git a/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll b/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll
index 65015afe4db..98697fa838c 100644
--- a/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll
+++ b/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.RemoteFlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 
 module SourceTest implements TestSig {
diff --git a/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql b/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql
index 4c0ab898686..963a6a1c1ac 100644
--- a/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql
+++ b/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql
@@ -9,7 +9,7 @@
 // 3. if necessary, look at partial paths by (un)commenting appropriate lines
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.dataflow.testConfig
+import utils.test.dataflow.testConfig
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql
index 9cbf6dd6ad8..7bb635891f5 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
-import TestUtilities.dataflow.DataflowQueryTest
+import utils.test.dataflow.DataflowQueryTest
 import experimental.Security.UnsafeUnpackQuery
 import FromTaintTrackingConfig<UnsafeUnpackConfig>
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql
index 939a81f73f7..d70552d1a8d 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql
+++ b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 import experimental.semmle.python.Concepts
 
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql
index 580c5fcc5f4..b4bcc3a30ab 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql
+++ b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
-import TestUtilities.dataflow.DataflowQueryTest
+import utils.test.dataflow.DataflowQueryTest
 import experimental.semmle.python.security.RemoteCommandExecution
 import FromTaintTrackingConfig<RemoteCommandExecutionConfig>
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql
index c1724c29d2c..c28fbe94eec 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
-import TestUtilities.dataflow.DataflowQueryTest
+import utils.test.dataflow.DataflowQueryTest
 import experimental.semmle.python.security.DecompressionBomb
 import FromTaintTrackingConfig<BombsConfig>
diff --git a/python/ql/test/library-tests/ApiGraphs/py2/use.ql b/python/ql/test/library-tests/ApiGraphs/py2/use.ql
index c89ad1c5196..d689d2e27a8 100644
--- a/python/ql/test/library-tests/ApiGraphs/py2/use.ql
+++ b/python/ql/test/library-tests/ApiGraphs/py2/use.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.ApiGraphs
 
 module ApiUseTest implements TestSig {
diff --git a/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql b/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql
index 520f507ca9f..3d3df4a18b8 100644
--- a/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql
+++ b/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql
@@ -1 +1 @@
-import TestUtilities.VerifyApiGraphs
+import utils.test.VerifyApiGraphs
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql b/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql
index e3308914a57..882941fc9b4 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql
+++ b/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql
@@ -1,6 +1,6 @@
 // Note: This is not using standard inline-expectation tests, so will not alert if you
 // have not manually added an annotation to a line!
-import TestUtilities.VerifyApiGraphs
+import utils.test.VerifyApiGraphs
 
 class CustomEntryPoint extends API::EntryPoint {
   CustomEntryPoint() { this = "CustomEntryPoint" }
diff --git a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql
index e4694ffc10d..d6253ab6af5 100644
--- a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql
+++ b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql
@@ -2,7 +2,7 @@
 // right values for `getARelevantTag`. We want to alert on this,
 // so it gets fixed!
 import python
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module MissingRelevantTag implements TestSig {
   string getARelevantTag() { none() }
diff --git a/python/ql/test/library-tests/dataflow/basic/callGraph.ql b/python/ql/test/library-tests/dataflow/basic/callGraph.ql
index f0e28c33dc6..16c859f89ec 100644
--- a/python/ql/test/library-tests/dataflow/basic/callGraph.ql
+++ b/python/ql/test/library-tests/dataflow/basic/callGraph.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.callGraphConfig
+import utils.test.dataflow.callGraphConfig
 
 from DataFlow::Node source, DataFlow::Node sink
 where
diff --git a/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql b/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql
index 472d6ccaa37..e7598e471e1 100644
--- a/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql
+++ b/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.callGraphConfig
+import utils.test.dataflow.callGraphConfig
 
 from DataFlow::Node sink
 where
diff --git a/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql b/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql
index 05b26caf3c0..a74bfa8afe1 100644
--- a/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql
+++ b/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.callGraphConfig
+import utils.test.dataflow.callGraphConfig
 
 from DataFlow::Node source
 where
diff --git a/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql b/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql
index 881592eeaeb..34c8894a974 100644
--- a/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql
+++ b/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql
@@ -1 +1 @@
-import TestUtilities.dataflow.LocalFlowStepTest
+import utils.test.dataflow.LocalFlowStepTest
diff --git a/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql b/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql
index 64867eb89da..ba374bc5ad7 100644
--- a/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql
+++ b/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql
@@ -1 +1 @@
-import TestUtilities.dataflow.MaximalFlowTest
+import utils.test.dataflow.MaximalFlowTest
diff --git a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
index c49511d9cdd..eb29ace49b3 100644
--- a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
+++ b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 
 module DataFlowCallTest implements TestSig {
diff --git a/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql
index f7e55d12ded..1e0627bfcca 100644
--- a/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql b/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql
index 02b503824d4..7851dc4dda8 100644
--- a/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql
+++ b/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
-import TestUtilities.dataflow.RoutingTest
+import utils.test.dataflow.RoutingTest
 
 module Argument1RoutingTest implements RoutingTestSig {
   class Argument = Unit;
diff --git a/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql
index f7e55d12ded..1e0627bfcca 100644
--- a/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql
index f7e55d12ded..1e0627bfcca 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql
index 299339dacf8..57e8e7f880f 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql
+++ b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql
@@ -1,5 +1,5 @@
 import python
-import TestUtilities.dataflow.UnresolvedCalls
+import utils.test.dataflow.UnresolvedCalls
 private import semmle.python.dataflow.new.DataFlow
 
 module IgnoreDictMethod implements UnresolvedCallExpectationsSig {
diff --git a/python/ql/test/library-tests/dataflow/global-flow/accesses.ql b/python/ql/test/library-tests/dataflow/global-flow/accesses.ql
index 5d65758ec14..e6721918e60 100644
--- a/python/ql/test/library-tests/dataflow/global-flow/accesses.ql
+++ b/python/ql/test/library-tests/dataflow/global-flow/accesses.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module GlobalReadTest implements TestSig {
   string getARelevantTag() { result = "reads" }
diff --git a/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql
index f7e55d12ded..1e0627bfcca 100644
--- a/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql
index f7e55d12ded..1e0627bfcca 100644
--- a/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql b/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql
index 36aa6e007a7..e3ca2484e52 100644
--- a/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql
+++ b/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql
@@ -1,6 +1,6 @@
 // This query should be more focused yet.
 import python
-import TestUtilities.dataflow.FlowTest
+import utils.test.dataflow.FlowTest
 private import semmle.python.dataflow.new.internal.PrintNode
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP
 
diff --git a/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql b/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql
index 8100e999491..67321c45c10 100644
--- a/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql
+++ b/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql
@@ -5,8 +5,8 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
-import TestUtilities.dataflow.testConfig
-import TestUtilities.InlineExpectationsTest
+import utils.test.dataflow.testConfig
+import utils.test.InlineExpectationsTest
 
 module TestTaintFlow = TaintTracking::Global<TestConfig>;
 
diff --git a/python/ql/test/library-tests/dataflow/regression/dataflow.ql b/python/ql/test/library-tests/dataflow/regression/dataflow.ql
index 27645d084b8..f5632dc9959 100644
--- a/python/ql/test/library-tests/dataflow/regression/dataflow.ql
+++ b/python/ql/test/library-tests/dataflow/regression/dataflow.ql
@@ -6,7 +6,7 @@
  */
 
 import python
-import TestUtilities.dataflow.testConfig
+import utils.test.dataflow.testConfig
 
 from DataFlow::Node source, DataFlow::Node sink
 where TestFlow::flow(source, sink)
diff --git a/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql b/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql
index 67c375366c5..058cf1fcf4a 100644
--- a/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql
+++ b/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql
@@ -4,7 +4,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.dataflow.new.SensitiveDataSources
 private import semmle.python.ApiGraphs
 
diff --git a/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql b/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql
index 59376d7a53c..98528085b8b 100644
--- a/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql
+++ b/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql
@@ -1,3 +1,3 @@
 import python
 private import TestSummaries
-import TestUtilities.dataflow.NormalTaintTrackingTest
+import utils.test.dataflow.NormalTaintTrackingTest
diff --git a/python/ql/test/library-tests/dataflow/summaries/summaries.ql b/python/ql/test/library-tests/dataflow/summaries/summaries.ql
index 4b5e79d2886..fdb225aa808 100644
--- a/python/ql/test/library-tests/dataflow/summaries/summaries.ql
+++ b/python/ql/test/library-tests/dataflow/summaries/summaries.ql
@@ -8,7 +8,7 @@ import TestFlow::PathGraph
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.internal.FlowSummaryImpl
 import semmle.python.ApiGraphs
-import TestUtilities.dataflow.testTaintConfig
+import utils.test.dataflow.testTaintConfig
 private import TestSummaries
 
 query predicate invalidSpecComponent(SummarizedCallable sc, string s, string c) {
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql
index f7e55d12ded..1e0627bfcca 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql b/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql
index b4b626ff97e..c4ed2522092 100644
--- a/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql
+++ b/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TypeTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.ApiGraphs
 import TestSummaries
 
diff --git a/python/ql/test/library-tests/dataflow/typetracking/tracked.ql b/python/ql/test/library-tests/dataflow/typetracking/tracked.ql
index 8bad0e33ead..e720fd3c451 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/tracked.ql
+++ b/python/ql/test/library-tests/dataflow/typetracking/tracked.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TypeTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.ApiGraphs
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP
 
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql b/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql
index f8110174151..1f07106fa67 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql
+++ b/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
-import TestUtilities.dataflow.testConfig
+import utils.test.InlineExpectationsTest
+import utils.test.dataflow.testConfig
 
 module CaptureTest implements TestSig {
   string getARelevantTag() { result = "captured" }
diff --git a/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql b/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql
index 4635dda09f8..19152e49d30 100644
--- a/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql
+++ b/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.essa.SsaCompute
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module UseTest implements TestSig {
   string getARelevantTag() { result in ["use-use", "def-use", "def"] }
diff --git a/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql b/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql
index f7e55d12ded..1e0627bfcca 100644
--- a/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql
index 499743869b0..b0325b027c3 100644
--- a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql
+++ b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql
@@ -1,7 +1,7 @@
 private import python
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.frameworks.internal.PoorMansFunctionResolution
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module InlinePoorMansFunctionResolutionTest implements TestSig {
   string getARelevantTag() { result = "resolved" }
diff --git a/python/ql/test/library-tests/regex/SubstructureTests.ql b/python/ql/test/library-tests/regex/SubstructureTests.ql
index f575670e16a..34167d899ab 100644
--- a/python/ql/test/library-tests/regex/SubstructureTests.ql
+++ b/python/ql/test/library-tests/regex/SubstructureTests.ql
@@ -1,5 +1,5 @@
 import python
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.regex
 
 module CharacterSetTest implements TestSig {
diff --git a/python/ql/test/library-tests/regexparser/Locations.ql b/python/ql/test/library-tests/regexparser/Locations.ql
index bef14918dc6..75cef3f3c8a 100644
--- a/python/ql/test/library-tests/regexparser/Locations.ql
+++ b/python/ql/test/library-tests/regexparser/Locations.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.regexp.RegexTreeView::RegexTreeView
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 
 module RegexLocationTest implements TestSig {
diff --git a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql
index eaf935d573b..2371d8c0008 100644
--- a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql
+++ b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.functions.ModificationOfParameterWithDefault
 private import semmle.python.dataflow.new.internal.PrintNode
 
diff --git a/python/ql/test/query-tests/Numerics/Pythagorean.qlref b/python/ql/test/query-tests/Numerics/Pythagorean.qlref
index 541bd35ac62..ed76bdfeb7b 100644
--- a/python/ql/test/query-tests/Numerics/Pythagorean.qlref
+++ b/python/ql/test/query-tests/Numerics/Pythagorean.qlref
@@ -1,2 +1,2 @@
 query: Numerics/Pythagorean.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql
index a0cdc79b17d..e4720596a37 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
-import TestUtilities.dataflow.DataflowQueryTest
+import utils.test.dataflow.DataflowQueryTest
 import semmle.python.security.dataflow.PathInjectionQuery
 import FromTaintTrackingStateConfig<PathInjectionConfig>
diff --git a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql
index 26350c3db65..dd521acc77d 100644
--- a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql
+++ b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
-import TestUtilities.dataflow.DataflowQueryTest
+import utils.test.dataflow.DataflowQueryTest
 import semmle.python.security.dataflow.CommandInjectionQuery
 import FromTaintTrackingConfig<CommandInjectionConfig>
diff --git a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql
index 521527e7e4f..51255358ec7 100644
--- a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql
+++ b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
-import TestUtilities.dataflow.DataflowQueryTest
+import utils.test.dataflow.DataflowQueryTest
 import semmle.python.security.dataflow.UnsafeShellCommandConstructionQuery
 import FromTaintTrackingConfig<UnsafeShellCommandConstructionConfig>
diff --git a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref
index 0135c6787d4..bfeec8aec39 100644
--- a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref
+++ b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref
@@ -1,2 +1,2 @@
 query: Security/CWE-094/CodeInjection.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql
index eb837559386..1a0e4052103 100644
--- a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql
+++ b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.security.dataflow.ExceptionInfo
 
 module ExceptionInfoTest implements TestSig {
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql
index 5123e883d9c..d67ff632ce3 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
-import TestUtilities.dataflow.DataflowQueryTest
+import utils.test.dataflow.DataflowQueryTest
 import semmle.python.security.dataflow.NoSqlInjectionQuery
 import FromTaintTrackingStateConfig<NoSqlInjectionConfig>