diff --git a/library/agent/Agent.test.ts b/library/agent/Agent.test.ts
index 8a3557c31..04f719f1f 100644
--- a/library/agent/Agent.test.ts
+++ b/library/agent/Agent.test.ts
@@ -1,6 +1,6 @@
 import * as FakeTimers from "@sinonjs/fake-timers";
 import { hostname, platform, release } from "os";
-import * as t from "tap";
+import t from "tap";
 import { getSemverNodeVersion } from "../helpers/getNodeVersion";
 import { ip } from "../helpers/ipAddress";
 import { MongoDB } from "../sinks/MongoDB";
diff --git a/library/agent/Context.test.ts b/library/agent/Context.test.ts
index 546bec68b..6e2535be6 100644
--- a/library/agent/Context.test.ts
+++ b/library/agent/Context.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { extractStringsFromUserInputCached } from "../helpers/extractStringsFromUserInputCached";
 import {
   type Context,
diff --git a/library/agent/Hostnames.test.ts b/library/agent/Hostnames.test.ts
index 462e72322..26bcc5787 100644
--- a/library/agent/Hostnames.test.ts
+++ b/library/agent/Hostnames.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Hostnames } from "./Hostnames";
 
 t.test("it works", async () => {
diff --git a/library/agent/InspectionStatistics.test.ts b/library/agent/InspectionStatistics.test.ts
index fc218b3a0..1c9ef964c 100644
--- a/library/agent/InspectionStatistics.test.ts
+++ b/library/agent/InspectionStatistics.test.ts
@@ -1,5 +1,5 @@
 import * as FakeTimers from "@sinonjs/fake-timers";
-import * as t from "tap";
+import t from "tap";
 import { InspectionStatistics } from "./InspectionStatistics";
 
 t.test("it resets stats", async () => {
diff --git a/library/agent/Routes.test.ts b/library/agent/Routes.test.ts
index 19816cb35..6e41ca7fb 100644
--- a/library/agent/Routes.test.ts
+++ b/library/agent/Routes.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Routes } from "./Routes";
 import { Context } from "./Context";
 
diff --git a/library/agent/ServiceConfig.test.ts b/library/agent/ServiceConfig.test.ts
index 908b74a2d..5c38d9063 100644
--- a/library/agent/ServiceConfig.test.ts
+++ b/library/agent/ServiceConfig.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { ServiceConfig } from "./ServiceConfig";
 
 t.test("it returns false if empty rules", async () => {
diff --git a/library/agent/Users.test.ts b/library/agent/Users.test.ts
index 2778a498b..4cd416e4f 100644
--- a/library/agent/Users.test.ts
+++ b/library/agent/Users.test.ts
@@ -1,5 +1,5 @@
 import * as FakeTimers from "@sinonjs/fake-timers";
-import * as t from "tap";
+import t from "tap";
 import { Users } from "./Users";
 
 t.test("it works", async () => {
diff --git a/library/agent/api-discovery/getApiAuthType.test.ts b/library/agent/api-discovery/getApiAuthType.test.ts
index 06a9d1bde..af0165251 100644
--- a/library/agent/api-discovery/getApiAuthType.test.ts
+++ b/library/agent/api-discovery/getApiAuthType.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getApiAuthType as get } from "./getApiAuthType";
 import type { Context } from "../Context";
 
diff --git a/library/agent/api-discovery/getBodyDataType.test.ts b/library/agent/api-discovery/getBodyDataType.test.ts
index c83b89a09..d421f39ee 100644
--- a/library/agent/api-discovery/getBodyDataType.test.ts
+++ b/library/agent/api-discovery/getBodyDataType.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getBodyDataType } from "./getBodyDataType";
 
 t.test("it works", async (t) => {
diff --git a/library/agent/api-discovery/getDataSchema.test.ts b/library/agent/api-discovery/getDataSchema.test.ts
index 9cecf86d3..4c6c7826a 100644
--- a/library/agent/api-discovery/getDataSchema.test.ts
+++ b/library/agent/api-discovery/getDataSchema.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getDataSchema } from "./getDataSchema";
 
 t.test("it works", async (t) => {
diff --git a/library/agent/api-discovery/mergeApiAuthTypes.test.ts b/library/agent/api-discovery/mergeApiAuthTypes.test.ts
index bb61c60d5..f731c1927 100644
--- a/library/agent/api-discovery/mergeApiAuthTypes.test.ts
+++ b/library/agent/api-discovery/mergeApiAuthTypes.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { mergeApiAuthTypes as merge } from "./mergeApiAuthTypes";
 
 t.test("it works", async (t) => {
diff --git a/library/agent/api-discovery/mergeDataSchemas.test.ts b/library/agent/api-discovery/mergeDataSchemas.test.ts
index acae3da21..663a74450 100644
--- a/library/agent/api-discovery/mergeDataSchemas.test.ts
+++ b/library/agent/api-discovery/mergeDataSchemas.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { mergeDataSchemas } from "./mergeDataSchemas";
 import { getDataSchema } from "./getDataSchema";
 
diff --git a/library/agent/api/ReportingAPINodeHTTP.test.ts b/library/agent/api/ReportingAPINodeHTTP.test.ts
index ec6d05018..da9bef33b 100644
--- a/library/agent/api/ReportingAPINodeHTTP.test.ts
+++ b/library/agent/api/ReportingAPINodeHTTP.test.ts
@@ -1,6 +1,6 @@
 import * as express from "express";
 import * as asyncHandler from "express-async-handler";
-import * as t from "tap";
+import t from "tap";
 import { ReportingAPINodeHTTP } from "./ReportingAPINodeHTTP";
 import { Event } from "./Event";
 import { Token } from "./Token";
diff --git a/library/agent/api/ReportingAPIRateLimitedClientSide.test.ts b/library/agent/api/ReportingAPIRateLimitedClientSide.test.ts
index fa82d82cd..4ca131826 100644
--- a/library/agent/api/ReportingAPIRateLimitedClientSide.test.ts
+++ b/library/agent/api/ReportingAPIRateLimitedClientSide.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { ReportingAPIForTesting } from "./ReportingAPIForTesting";
 import { ReportingAPIRateLimitedClientSide } from "./ReportingAPIRateLimitedClientSide";
 import { Token } from "./Token";
diff --git a/library/agent/api/ReportingAPIRateLimitedServerSide.test.ts b/library/agent/api/ReportingAPIRateLimitedServerSide.test.ts
index 5ce783551..5b46822c6 100644
--- a/library/agent/api/ReportingAPIRateLimitedServerSide.test.ts
+++ b/library/agent/api/ReportingAPIRateLimitedServerSide.test.ts
@@ -1,5 +1,5 @@
 import * as FakeTimers from "@sinonjs/fake-timers";
-import * as t from "tap";
+import t from "tap";
 import { ReportingAPIForTesting } from "./ReportingAPIForTesting";
 import { ReportingAPIRateLimitedServerSide } from "./ReportingAPIRateLimitedServerSide";
 import { Event } from "./Event";
diff --git a/library/agent/api/ReportingAPIThatValidatesToken.test.ts b/library/agent/api/ReportingAPIThatValidatesToken.test.ts
index a8f399ac2..0cf601d73 100644
--- a/library/agent/api/ReportingAPIThatValidatesToken.test.ts
+++ b/library/agent/api/ReportingAPIThatValidatesToken.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { ReportingAPIForTesting } from "./ReportingAPIForTesting";
 import { ReportingAPIThatValidatesToken } from "./ReportingAPIThatValidatesToken";
 import { Event } from "./Event";
diff --git a/library/agent/api/Token.test.ts b/library/agent/api/Token.test.ts
index 052f360b9..86f3988a8 100644
--- a/library/agent/api/Token.test.ts
+++ b/library/agent/api/Token.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Token } from "./Token";
 
 t.test("it throws error if token is empty", async (t) => {
diff --git a/library/agent/applyHooks.test.ts b/library/agent/applyHooks.test.ts
index 61538d1aa..3183830f7 100644
--- a/library/agent/applyHooks.test.ts
+++ b/library/agent/applyHooks.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "./Agent";
 import { ReportingAPIForTesting } from "./api/ReportingAPIForTesting";
 import { Token } from "./api/Token";
diff --git a/library/agent/context/user.test.ts b/library/agent/context/user.test.ts
index af0d49bc8..eb7fc0c83 100644
--- a/library/agent/context/user.test.ts
+++ b/library/agent/context/user.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../Agent";
 import { setInstance } from "../AgentSingleton";
 import { ReportingAPIForTesting } from "../api/ReportingAPIForTesting";
diff --git a/library/agent/hooks/Hooks.test.ts b/library/agent/hooks/Hooks.test.ts
index 3980ea26c..465094b6c 100644
--- a/library/agent/hooks/Hooks.test.ts
+++ b/library/agent/hooks/Hooks.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Hooks } from "./Hooks";
 
 t.test("package throws error if name is empty", async (t) => {
diff --git a/library/agent/hooks/getModuleInfoFromPath.test.ts b/library/agent/hooks/getModuleInfoFromPath.test.ts
index 28d31cc5f..41b39f1c3 100644
--- a/library/agent/hooks/getModuleInfoFromPath.test.ts
+++ b/library/agent/hooks/getModuleInfoFromPath.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getModuleInfoFromPath } from "./getModuleInfoFromPath";
 
 t.test("it works", async (t) => {
diff --git a/library/agent/hooks/isBuiltinModule.test.ts b/library/agent/hooks/isBuiltinModule.test.ts
index def4d28a5..a220ac8db 100644
--- a/library/agent/hooks/isBuiltinModule.test.ts
+++ b/library/agent/hooks/isBuiltinModule.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isBuiltinModule } from "./isBuiltinModule";
 
 t.test("it works", async (t) => {
diff --git a/library/agent/hooks/isMainJsFile.test.ts b/library/agent/hooks/isMainJsFile.test.ts
index 85e229a2f..e587cefb5 100644
--- a/library/agent/hooks/isMainJsFile.test.ts
+++ b/library/agent/hooks/isMainJsFile.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isMainJsFile } from "./isMainJsFile";
 import type { PackageJson } from "type-fest";
 
diff --git a/library/agent/hooks/wrapExport.test.ts b/library/agent/hooks/wrapExport.test.ts
index dba2896ab..6a9559642 100644
--- a/library/agent/hooks/wrapExport.test.ts
+++ b/library/agent/hooks/wrapExport.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { wrapExport } from "./wrapExport";
 import { Agent } from "../Agent";
 import { LoggerForTesting } from "../logger/LoggerForTesting";
diff --git a/library/agent/hooks/wrapNewInstance.test.ts b/library/agent/hooks/wrapNewInstance.test.ts
index 3d02518d9..c9e41c151 100644
--- a/library/agent/hooks/wrapNewInstance.test.ts
+++ b/library/agent/hooks/wrapNewInstance.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import * as t from "tap";
+import t from "tap";
 import { wrapNewInstance } from "./wrapNewInstance";
 import { Agent } from "../Agent";
 import { LoggerForTesting } from "../logger/LoggerForTesting";
diff --git a/library/agent/hooks/wrapRequire.test.ts b/library/agent/hooks/wrapRequire.test.ts
index 3a38d2fe7..5149a2182 100644
--- a/library/agent/hooks/wrapRequire.test.ts
+++ b/library/agent/hooks/wrapRequire.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import {
   wrapRequire,
   setPackagesToPatch,
diff --git a/library/agent/realtime/pollForChanges.test.ts b/library/agent/realtime/pollForChanges.test.ts
index 54cfe65d8..c63a7b4bd 100644
--- a/library/agent/realtime/pollForChanges.test.ts
+++ b/library/agent/realtime/pollForChanges.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import * as fetch from "../../helpers/fetch";
 import { wrap } from "../../helpers/wrap";
 import { Token } from "../api/Token";
diff --git a/library/helpers/buildRouteFromURL.test.ts b/library/helpers/buildRouteFromURL.test.ts
index d01ebe7b3..fa6f53d8c 100644
--- a/library/helpers/buildRouteFromURL.test.ts
+++ b/library/helpers/buildRouteFromURL.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { buildRouteFromURL } from "./buildRouteFromURL";
 import * as ObjectID from "bson-objectid";
 
diff --git a/library/helpers/cleanupStackTrace.test.ts b/library/helpers/cleanupStackTrace.test.ts
index 9e68fa365..143547939 100644
--- a/library/helpers/cleanupStackTrace.test.ts
+++ b/library/helpers/cleanupStackTrace.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { cleanupStackTrace } from "./cleanupStackTrace";
 
 t.test("it works", async () => {
diff --git a/library/helpers/convertRequestBodyToString.test.ts b/library/helpers/convertRequestBodyToString.test.ts
index 1bffa307e..feae1b52e 100644
--- a/library/helpers/convertRequestBodyToString.test.ts
+++ b/library/helpers/convertRequestBodyToString.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { convertRequestBodyToString } from "./convertRequestBodyToString";
 
 t.test("it converts object body to JSON string", async (t) => {
diff --git a/library/helpers/escapeHTML.test.ts b/library/helpers/escapeHTML.test.ts
index 3b05974db..829445d88 100644
--- a/library/helpers/escapeHTML.test.ts
+++ b/library/helpers/escapeHTML.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { escapeHTML } from "./escapeHTML";
 
 t.test('should escape "&" character', async (t) => {
diff --git a/library/helpers/escapeStringRegexp.test.ts b/library/helpers/escapeStringRegexp.test.ts
index 7151baec8..c43014460 100644
--- a/library/helpers/escapeStringRegexp.test.ts
+++ b/library/helpers/escapeStringRegexp.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { escapeStringRegexp } from "./escapeStringRegexp";
 
 t.test("main", async (t) => {
diff --git a/library/helpers/extractStringsFromUserInput.test.ts b/library/helpers/extractStringsFromUserInput.test.ts
index baa1df19a..823730341 100644
--- a/library/helpers/extractStringsFromUserInput.test.ts
+++ b/library/helpers/extractStringsFromUserInput.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import * as t from "tap";
+import t from "tap";
 import { extractStringsFromUserInput } from "./extractStringsFromUserInput";
 
 t.test("empty object returns empty array", async () => {
diff --git a/library/helpers/featureFlags.test.ts b/library/helpers/featureFlags.test.ts
index f1ba3fc81..b938a9759 100644
--- a/library/helpers/featureFlags.test.ts
+++ b/library/helpers/featureFlags.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isFeatureEnabled } from "./featureFlags";
 
 t.test("isFeatureEnabled", async (t) => {
diff --git a/library/helpers/filterEmptyRequestHeaders.test.ts b/library/helpers/filterEmptyRequestHeaders.test.ts
index f42eaff11..9fe864fbc 100644
--- a/library/helpers/filterEmptyRequestHeaders.test.ts
+++ b/library/helpers/filterEmptyRequestHeaders.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { filterEmptyRequestHeaders } from "./filterEmptyRequestHeaders";
 
 t.test("it filters empty headers", async (t) => {
diff --git a/library/helpers/getAgentVersion.test.ts b/library/helpers/getAgentVersion.test.ts
index 25272be6e..9ab6850d0 100644
--- a/library/helpers/getAgentVersion.test.ts
+++ b/library/helpers/getAgentVersion.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getAgentVersion } from "./getAgentVersion";
 
 t.test("it returns the current library version", async () => {
diff --git a/library/helpers/getCurrentAndNextSegments.test.ts b/library/helpers/getCurrentAndNextSegments.test.ts
index db009181c..5cad4f610 100644
--- a/library/helpers/getCurrentAndNextSegments.test.ts
+++ b/library/helpers/getCurrentAndNextSegments.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getCurrentAndNextSegments } from "./getCurrentAndNextSegments";
 
 t.test(
diff --git a/library/helpers/getMaxBodySize.test.ts b/library/helpers/getMaxBodySize.test.ts
index f22c60d93..443a326ba 100644
--- a/library/helpers/getMaxBodySize.test.ts
+++ b/library/helpers/getMaxBodySize.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getMaxBodySize } from "./getMaxBodySize";
 
 t.test(
diff --git a/library/helpers/getNodeVersion.test.ts b/library/helpers/getNodeVersion.test.ts
index c64d6410d..fed327839 100644
--- a/library/helpers/getNodeVersion.test.ts
+++ b/library/helpers/getNodeVersion.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import {
   getMajorNodeVersion,
   getMinorNodeVersion,
diff --git a/library/helpers/getPackageVersion.test.ts b/library/helpers/getPackageVersion.test.ts
index 51699abdf..0998c7626 100644
--- a/library/helpers/getPackageVersion.test.ts
+++ b/library/helpers/getPackageVersion.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getPackageVersion } from "./getPackageVersion";
 
 t.test("it resolves the version of a package", async (t) => {
diff --git a/library/helpers/getPortFromURL.test.ts b/library/helpers/getPortFromURL.test.ts
index 5b0f32cda..71b1a7cb6 100644
--- a/library/helpers/getPortFromURL.test.ts
+++ b/library/helpers/getPortFromURL.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getPortFromURL } from "./getPortFromURL";
 
 t.test("it works", async (t) => {
diff --git a/library/helpers/ipAddress.test.ts b/library/helpers/ipAddress.test.ts
index 234e1e1bb..38c63e5a2 100644
--- a/library/helpers/ipAddress.test.ts
+++ b/library/helpers/ipAddress.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { wrap } from "./wrap";
 import { ip } from "./ipAddress";
 
diff --git a/library/helpers/isAikidoCI.test.ts b/library/helpers/isAikidoCI.test.ts
index dcab9800e..9ae460aaa 100644
--- a/library/helpers/isAikidoCI.test.ts
+++ b/library/helpers/isAikidoCI.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isAikidoCI } from "./isAikidoCI";
 
 t.test("get aikido ci env", async (t) => {
diff --git a/library/helpers/isPackageInstalled.test.ts b/library/helpers/isPackageInstalled.test.ts
index 34584d8a7..c24bcfbec 100644
--- a/library/helpers/isPackageInstalled.test.ts
+++ b/library/helpers/isPackageInstalled.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isPackageInstalled } from "./isPackageInstalled";
 
 t.test("it returns true if the package is installed", async (t) => {
diff --git a/library/helpers/isPlainObject.test.ts b/library/helpers/isPlainObject.test.ts
index 4382d1cee..078a9ce33 100644
--- a/library/helpers/isPlainObject.test.ts
+++ b/library/helpers/isPlainObject.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isPlainObject } from "./isPlainObject";
 
 t.test(
diff --git a/library/helpers/limitLengthMetadata.test.ts b/library/helpers/limitLengthMetadata.test.ts
index 04d4138c6..96dbb199b 100644
--- a/library/helpers/limitLengthMetadata.test.ts
+++ b/library/helpers/limitLengthMetadata.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { limitLengthMetadata } from "./limitLengthMetadata";
 
 t.test("it limits metadata length", async () => {
diff --git a/library/helpers/looksLikeASecret.test.ts b/library/helpers/looksLikeASecret.test.ts
index 0c6d55607..2695cee77 100644
--- a/library/helpers/looksLikeASecret.test.ts
+++ b/library/helpers/looksLikeASecret.test.ts
@@ -1,5 +1,5 @@
 import { randomInt } from "crypto";
-import * as t from "tap";
+import t from "tap";
 import { looksLikeASecret } from "./looksLikeASecret";
 
 const lower = "abcdefghijklmnopqrstuvwxyz";
diff --git a/library/helpers/matchEndpoints.test.ts b/library/helpers/matchEndpoints.test.ts
index 8fd45c39b..daa14706f 100644
--- a/library/helpers/matchEndpoints.test.ts
+++ b/library/helpers/matchEndpoints.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Context } from "../agent/Context";
 import { buildRouteFromURL } from "./buildRouteFromURL";
 import { matchEndpoints } from "./matchEndpoints";
diff --git a/library/helpers/package-json.test.ts b/library/helpers/package-json.test.ts
index 8efe2343a..46ad464db 100644
--- a/library/helpers/package-json.test.ts
+++ b/library/helpers/package-json.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 
 const PackageJson = require("../package.json");
 
diff --git a/library/helpers/parseCookies.test.ts b/library/helpers/parseCookies.test.ts
index 636a7ec21..d67fd5078 100644
--- a/library/helpers/parseCookies.test.ts
+++ b/library/helpers/parseCookies.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { parse } from "./parseCookies";
 
 t.test("should parse cookie string to object", async () => {
diff --git a/library/helpers/percentiles.test.ts b/library/helpers/percentiles.test.ts
index c2599f5d5..aafcb7d63 100644
--- a/library/helpers/percentiles.test.ts
+++ b/library/helpers/percentiles.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { percentiles } from "./percentiles";
 
 function generateArray(
diff --git a/library/helpers/satisfiesVersion.test.ts b/library/helpers/satisfiesVersion.test.ts
index 76da7cc7e..935a59668 100644
--- a/library/helpers/satisfiesVersion.test.ts
+++ b/library/helpers/satisfiesVersion.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { satisfiesVersion } from "./satisfiesVersion";
 
 t.test("it returns false if empty strings", async () => {
diff --git a/library/helpers/tryDecodeAsJWT.test.ts b/library/helpers/tryDecodeAsJWT.test.ts
index d32e8d188..f517f2457 100644
--- a/library/helpers/tryDecodeAsJWT.test.ts
+++ b/library/helpers/tryDecodeAsJWT.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { tryDecodeAsJWT } from "./tryDecodeAsJWT";
 
 t.test("it returns undefined for empty string", async () => {
diff --git a/library/helpers/tryParseURL.test.ts b/library/helpers/tryParseURL.test.ts
index b2860043a..986e935e8 100644
--- a/library/helpers/tryParseURL.test.ts
+++ b/library/helpers/tryParseURL.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { tryParseURL } from "./tryParseURL";
 
 t.test("it returns undefined if invalid URL", async () => {
diff --git a/library/helpers/tryParseURLParams.test.ts b/library/helpers/tryParseURLParams.test.ts
index 68fd9bc7b..254a3e0cf 100644
--- a/library/helpers/tryParseURLParams.test.ts
+++ b/library/helpers/tryParseURLParams.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { tryParseURLParams } from "./tryParseURLParams";
 
 t.test("it returns undefined if invalid URL", async () => {
diff --git a/library/helpers/tryParseURLPath.test.ts b/library/helpers/tryParseURLPath.test.ts
index 599715887..ffc52d7f2 100644
--- a/library/helpers/tryParseURLPath.test.ts
+++ b/library/helpers/tryParseURLPath.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { tryParseURLPath } from "./tryParseURLPath";
 
 t.test("it returns undefined if nothing found", async () => {
diff --git a/library/helpers/wrap.test.ts b/library/helpers/wrap.test.ts
index abe18c6fb..fb3df8102 100644
--- a/library/helpers/wrap.test.ts
+++ b/library/helpers/wrap.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isWrapped, wrap } from "./wrap";
 
 class MyClass {
diff --git a/library/ratelimiting/LRUMap.test.ts b/library/ratelimiting/LRUMap.test.ts
index 09cd1d242..e31628c11 100644
--- a/library/ratelimiting/LRUMap.test.ts
+++ b/library/ratelimiting/LRUMap.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { LRUMap } from "./LRUMap";
 
 t.test("it creates LRUMap", async (t) => {
diff --git a/library/ratelimiting/RateLimiter.test.ts b/library/ratelimiting/RateLimiter.test.ts
index c4cb08ad3..200990442 100644
--- a/library/ratelimiting/RateLimiter.test.ts
+++ b/library/ratelimiting/RateLimiter.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import * as FakeTimers from "@sinonjs/fake-timers";
 import { RateLimiter } from "./RateLimiter";
 
diff --git a/library/ratelimiting/getRateLimitedEndpoint.test.ts b/library/ratelimiting/getRateLimitedEndpoint.test.ts
index c3233353a..1faa9c300 100644
--- a/library/ratelimiting/getRateLimitedEndpoint.test.ts
+++ b/library/ratelimiting/getRateLimitedEndpoint.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import type { Context } from "../agent/Context";
 import { ServiceConfig } from "../agent/ServiceConfig";
 import { getRateLimitedEndpoint } from "./getRateLimitedEndpoint";
diff --git a/library/ratelimiting/shouldRateLimitRequest.test.ts b/library/ratelimiting/shouldRateLimitRequest.test.ts
index 01c3e9a05..aede58d6a 100644
--- a/library/ratelimiting/shouldRateLimitRequest.test.ts
+++ b/library/ratelimiting/shouldRateLimitRequest.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/AwsSDKVersion2.test.ts b/library/sinks/AwsSDKVersion2.test.ts
index 2a9f97cff..78bef0aad 100644
--- a/library/sinks/AwsSDKVersion2.test.ts
+++ b/library/sinks/AwsSDKVersion2.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Context, runWithContext } from "../agent/Context";
diff --git a/library/sinks/BetterSQLite3.test.ts b/library/sinks/BetterSQLite3.test.ts
index 3770a7be9..16262cc4f 100644
--- a/library/sinks/BetterSQLite3.test.ts
+++ b/library/sinks/BetterSQLite3.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/ChildProcess.test.ts b/library/sinks/ChildProcess.test.ts
index b57e72b1a..56a048b52 100644
--- a/library/sinks/ChildProcess.test.ts
+++ b/library/sinks/ChildProcess.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Context, runWithContext } from "../agent/Context";
diff --git a/library/sinks/Fetch.test.ts b/library/sinks/Fetch.test.ts
index b2ed54089..1e02e2d47 100644
--- a/library/sinks/Fetch.test.ts
+++ b/library/sinks/Fetch.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/FileSystem.test.ts b/library/sinks/FileSystem.test.ts
index a13132e70..6a32a410d 100644
--- a/library/sinks/FileSystem.test.ts
+++ b/library/sinks/FileSystem.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Context, runWithContext } from "../agent/Context";
diff --git a/library/sinks/HTTPRequest.axios.test.ts b/library/sinks/HTTPRequest.axios.test.ts
index e0d12083b..2d0d29361 100644
--- a/library/sinks/HTTPRequest.axios.test.ts
+++ b/library/sinks/HTTPRequest.axios.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/HTTPRequest.followRedirects.test.ts b/library/sinks/HTTPRequest.followRedirects.test.ts
index e5baeeb11..1b761fcf1 100644
--- a/library/sinks/HTTPRequest.followRedirects.test.ts
+++ b/library/sinks/HTTPRequest.followRedirects.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/HTTPRequest.needle.test.ts b/library/sinks/HTTPRequest.needle.test.ts
index cc1bd643d..1b597cbe4 100644
--- a/library/sinks/HTTPRequest.needle.test.ts
+++ b/library/sinks/HTTPRequest.needle.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/HTTPRequest.nodeFetch.test.ts b/library/sinks/HTTPRequest.nodeFetch.test.ts
index 7ad3951d8..39b4d9fae 100644
--- a/library/sinks/HTTPRequest.nodeFetch.test.ts
+++ b/library/sinks/HTTPRequest.nodeFetch.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/HTTPRequest.redirect.test.ts b/library/sinks/HTTPRequest.redirect.test.ts
index 66374adf7..189dfdfe2 100644
--- a/library/sinks/HTTPRequest.redirect.test.ts
+++ b/library/sinks/HTTPRequest.redirect.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/HTTPRequest.test.ts b/library/sinks/HTTPRequest.test.ts
index 85bb98934..e23af5ee3 100644
--- a/library/sinks/HTTPRequest.test.ts
+++ b/library/sinks/HTTPRequest.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-rest-params */
 import * as dns from "dns";
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/MongoDB.test.ts b/library/sinks/MongoDB.test.ts
index b8feba3b6..62e32ad51 100644
--- a/library/sinks/MongoDB.test.ts
+++ b/library/sinks/MongoDB.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Context, runWithContext } from "../agent/Context";
diff --git a/library/sinks/MySQL.test.ts b/library/sinks/MySQL.test.ts
index 654a4d4ef..3de54b00a 100644
--- a/library/sinks/MySQL.test.ts
+++ b/library/sinks/MySQL.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { getContext, runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/MySQL2.test.ts b/library/sinks/MySQL2.test.ts
index a2604aa8a..c1425bd88 100644
--- a/library/sinks/MySQL2.test.ts
+++ b/library/sinks/MySQL2.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/NodeSQLite.test.ts b/library/sinks/NodeSQLite.test.ts
index c1450318f..15e1ba5b2 100644
--- a/library/sinks/NodeSQLite.test.ts
+++ b/library/sinks/NodeSQLite.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/Postgres.pool.test.ts b/library/sinks/Postgres.pool.test.ts
index f5e9310f7..8bb384557 100644
--- a/library/sinks/Postgres.pool.test.ts
+++ b/library/sinks/Postgres.pool.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/Postgres.test.ts b/library/sinks/Postgres.test.ts
index cf269d66f..bc3f507a1 100644
--- a/library/sinks/Postgres.test.ts
+++ b/library/sinks/Postgres.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { getContext, runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/SQLite3.test.ts b/library/sinks/SQLite3.test.ts
index 79b53685e..3a2bc22c8 100644
--- a/library/sinks/SQLite3.test.ts
+++ b/library/sinks/SQLite3.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/Shelljs.test.ts b/library/sinks/Shelljs.test.ts
index 2c1cfe9b5..e04e0ccc2 100644
--- a/library/sinks/Shelljs.test.ts
+++ b/library/sinks/Shelljs.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { getContext, runWithContext, type Context } from "../agent/Context";
diff --git a/library/sinks/Undici.test.ts b/library/sinks/Undici.test.ts
index 2e0155c93..802b2f25a 100644
--- a/library/sinks/Undici.test.ts
+++ b/library/sinks/Undici.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-rest-params */
 import * as dns from "dns";
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
diff --git a/library/sinks/http-request/getUrlFromHTTPRequestArgs.test.ts b/library/sinks/http-request/getUrlFromHTTPRequestArgs.test.ts
index b8179f133..0d41d24d0 100644
--- a/library/sinks/http-request/getUrlFromHTTPRequestArgs.test.ts
+++ b/library/sinks/http-request/getUrlFromHTTPRequestArgs.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getUrlFromHTTPRequestArgs as getURL } from "./getUrlFromHTTPRequestArgs";
 
 t.test("it works with strings", async (t) => {
diff --git a/library/sinks/http-request/isOptionsObject.test.ts b/library/sinks/http-request/isOptionsObject.test.ts
index d91a490c3..9a4c3e7b6 100644
--- a/library/sinks/http-request/isOptionsObject.test.ts
+++ b/library/sinks/http-request/isOptionsObject.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isOptionsObject } from "./isOptionsObject";
 
 t.test("it works with objects", async (t) => {
diff --git a/library/sinks/undici/parseHeaders.test.ts b/library/sinks/undici/parseHeaders.test.ts
index f0f0c395a..a17fca085 100644
--- a/library/sinks/undici/parseHeaders.test.ts
+++ b/library/sinks/undici/parseHeaders.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { parseHeaders } from "./parseHeaders";
 
 t.test("it works", async (t) => {
diff --git a/library/sources/Express.test.ts b/library/sources/Express.test.ts
index 62b64a21b..3c7304de9 100644
--- a/library/sources/Express.test.ts
+++ b/library/sources/Express.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { setInstance } from "../agent/AgentSingleton";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
diff --git a/library/sources/FastXmlParser.test.ts b/library/sources/FastXmlParser.test.ts
index e79cfbeaf..80d145807 100644
--- a/library/sources/FastXmlParser.test.ts
+++ b/library/sources/FastXmlParser.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { getContext, runWithContext } from "../agent/Context";
diff --git a/library/sources/FunctionsFramework.test.ts b/library/sources/FunctionsFramework.test.ts
index 4b901d439..add3c268e 100644
--- a/library/sources/FunctionsFramework.test.ts
+++ b/library/sources/FunctionsFramework.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import * as express from "express";
 import * as request from "supertest";
 import { Agent } from "../agent/Agent";
diff --git a/library/sources/GraphQL.test.ts b/library/sources/GraphQL.test.ts
index 321f402b6..2f97eb125 100644
--- a/library/sources/GraphQL.test.ts
+++ b/library/sources/GraphQL.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { getContext, runWithContext } from "../agent/Context";
diff --git a/library/sources/HTTP2Server.test.ts b/library/sources/HTTP2Server.test.ts
index 8d9a461cf..60e7db6ee 100644
--- a/library/sources/HTTP2Server.test.ts
+++ b/library/sources/HTTP2Server.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Token } from "../agent/api/Token";
 import { connect, IncomingHttpHeaders } from "http2";
 import { Agent } from "../agent/Agent";
diff --git a/library/sources/HTTPServer.test.ts b/library/sources/HTTPServer.test.ts
index f0f5f4b31..16ab66919 100644
--- a/library/sources/HTTPServer.test.ts
+++ b/library/sources/HTTPServer.test.ts
@@ -14,7 +14,7 @@ wrap(pkg, "isPackageInstalled", function wrap() {
   };
 });
 
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { getContext } from "../agent/Context";
diff --git a/library/sources/Hapi.test.ts b/library/sources/Hapi.test.ts
index 5f86e2836..c91adc1bd 100644
--- a/library/sources/Hapi.test.ts
+++ b/library/sources/Hapi.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { setInstance } from "../agent/AgentSingleton";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
diff --git a/library/sources/Hono.test.ts b/library/sources/Hono.test.ts
index 2ed0c5b2c..6c1aa74ba 100644
--- a/library/sources/Hono.test.ts
+++ b/library/sources/Hono.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { setInstance } from "../agent/AgentSingleton";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
diff --git a/library/sources/Lambda.test.ts b/library/sources/Lambda.test.ts
index bc0d2173f..b901b0df0 100644
--- a/library/sources/Lambda.test.ts
+++ b/library/sources/Lambda.test.ts
@@ -1,6 +1,6 @@
 import * as FakeTimers from "@sinonjs/fake-timers";
 import type { Context } from "aws-lambda";
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { setInstance } from "../agent/AgentSingleton";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
diff --git a/library/sources/Xml2js.test.ts b/library/sources/Xml2js.test.ts
index 3d0568361..9ca52e1aa 100644
--- a/library/sources/Xml2js.test.ts
+++ b/library/sources/Xml2js.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Context, getContext, runWithContext } from "../agent/Context";
diff --git a/library/sources/XmlMinusJs.test.ts b/library/sources/XmlMinusJs.test.ts
index 4d4311f42..a8da70d47 100644
--- a/library/sources/XmlMinusJs.test.ts
+++ b/library/sources/XmlMinusJs.test.ts
@@ -1,5 +1,5 @@
 import { join } from "path";
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../agent/Agent";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { getContext, runWithContext } from "../agent/Context";
diff --git a/library/sources/graphql/extractInputsFromDocument.test.ts b/library/sources/graphql/extractInputsFromDocument.test.ts
index 0c68cfc6e..e7529ffb7 100644
--- a/library/sources/graphql/extractInputsFromDocument.test.ts
+++ b/library/sources/graphql/extractInputsFromDocument.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import {
   GraphQLSchema,
   GraphQLObjectType,
diff --git a/library/sources/graphql/extractTopLevelFieldsFromDocument.test.ts b/library/sources/graphql/extractTopLevelFieldsFromDocument.test.ts
index 89f119536..c763ae467 100644
--- a/library/sources/graphql/extractTopLevelFieldsFromDocument.test.ts
+++ b/library/sources/graphql/extractTopLevelFieldsFromDocument.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { parse, FieldNode } from "graphql";
 import {
   extractTopLevelFieldsFromDocument,
diff --git a/library/sources/graphql/shouldRateLimitOperation.test.ts b/library/sources/graphql/shouldRateLimitOperation.test.ts
index 0b0363c79..19b40c9d2 100644
--- a/library/sources/graphql/shouldRateLimitOperation.test.ts
+++ b/library/sources/graphql/shouldRateLimitOperation.test.ts
@@ -1,5 +1,5 @@
 import { parse, ExecutionArgs } from "graphql";
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../../agent/Agent";
 import { ReportingAPIForTesting } from "../../agent/api/ReportingAPIForTesting";
 import { Token } from "../../agent/api/Token";
diff --git a/library/sources/http-server/ipAllowedToAccessRoute.test.ts b/library/sources/http-server/ipAllowedToAccessRoute.test.ts
index 1e08630dd..1431ac807 100644
--- a/library/sources/http-server/ipAllowedToAccessRoute.test.ts
+++ b/library/sources/http-server/ipAllowedToAccessRoute.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../../agent/Agent";
 import { ReportingAPIForTesting } from "../../agent/api/ReportingAPIForTesting";
 import { Token } from "../../agent/api/Token";
diff --git a/library/sources/http-server/shouldDiscoverRoute.test.ts b/library/sources/http-server/shouldDiscoverRoute.test.ts
index ac10649fc..22a048b71 100644
--- a/library/sources/http-server/shouldDiscoverRoute.test.ts
+++ b/library/sources/http-server/shouldDiscoverRoute.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { shouldDiscoverRoute } from "./shouldDiscoverRoute";
 
 t.test("it rejects invalid status codes", async () => {
diff --git a/library/vulnerabilities/nosql-injection/detectNoSQLInjection.test.ts b/library/vulnerabilities/nosql-injection/detectNoSQLInjection.test.ts
index 377b8b32f..3ec6ea878 100644
--- a/library/vulnerabilities/nosql-injection/detectNoSQLInjection.test.ts
+++ b/library/vulnerabilities/nosql-injection/detectNoSQLInjection.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { detectNoSQLInjection } from "./detectNoSQLInjection";
 import { Context } from "../../agent/Context";
 
diff --git a/library/vulnerabilities/path-traversal/checkContextForPathTraversal.test.ts b/library/vulnerabilities/path-traversal/checkContextForPathTraversal.test.ts
index 7788bc7db..9aecaa355 100644
--- a/library/vulnerabilities/path-traversal/checkContextForPathTraversal.test.ts
+++ b/library/vulnerabilities/path-traversal/checkContextForPathTraversal.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { checkContextForPathTraversal } from "./checkContextForPathTraversal";
 
 const unsafeContext = {
diff --git a/library/vulnerabilities/path-traversal/detectPathTraversal.test.ts b/library/vulnerabilities/path-traversal/detectPathTraversal.test.ts
index 1fe0acfff..0d9568587 100644
--- a/library/vulnerabilities/path-traversal/detectPathTraversal.test.ts
+++ b/library/vulnerabilities/path-traversal/detectPathTraversal.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { detectPathTraversal } from "./detectPathTraversal";
 import { join, resolve } from "path";
 
diff --git a/library/vulnerabilities/prototype-pollution/preventPrototypePollution.test.ts b/library/vulnerabilities/prototype-pollution/preventPrototypePollution.test.ts
index 691ef466e..18a48fba6 100644
--- a/library/vulnerabilities/prototype-pollution/preventPrototypePollution.test.ts
+++ b/library/vulnerabilities/prototype-pollution/preventPrototypePollution.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../../agent/Agent";
 import { setInstance } from "../../agent/AgentSingleton";
 import { ReportingAPIForTesting } from "../../agent/api/ReportingAPIForTesting";
diff --git a/library/vulnerabilities/shell-injection/checkContextForShellInjection.test.ts b/library/vulnerabilities/shell-injection/checkContextForShellInjection.test.ts
index cd13d22b1..67b7a22b6 100644
--- a/library/vulnerabilities/shell-injection/checkContextForShellInjection.test.ts
+++ b/library/vulnerabilities/shell-injection/checkContextForShellInjection.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { checkContextForShellInjection } from "./checkContextForShellInjection";
 
 t.test("it detects shell injection", async () => {
diff --git a/library/vulnerabilities/shell-injection/containsShellSyntax.test.ts b/library/vulnerabilities/shell-injection/containsShellSyntax.test.ts
index 72794daaf..26fba85ac 100644
--- a/library/vulnerabilities/shell-injection/containsShellSyntax.test.ts
+++ b/library/vulnerabilities/shell-injection/containsShellSyntax.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { containsShellSyntax } from "./containsShellSyntax";
 
 t.test("it detects shell syntax", async (t) => {
diff --git a/library/vulnerabilities/shell-injection/detectShellInjection.test.ts b/library/vulnerabilities/shell-injection/detectShellInjection.test.ts
index fb7cde07f..76679cfb0 100644
--- a/library/vulnerabilities/shell-injection/detectShellInjection.test.ts
+++ b/library/vulnerabilities/shell-injection/detectShellInjection.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { detectShellInjection } from "./detectShellInjection";
 import { quote } from "shell-quote";
 
diff --git a/library/vulnerabilities/shell-injection/isSafelyEncapsulated.test.ts b/library/vulnerabilities/shell-injection/isSafelyEncapsulated.test.ts
index 9ea756bb2..f32dd4087 100644
--- a/library/vulnerabilities/shell-injection/isSafelyEncapsulated.test.ts
+++ b/library/vulnerabilities/shell-injection/isSafelyEncapsulated.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isSafelyEncapsulated } from "./isSafelyEncapsulated";
 
 t.test("safe between single quotes", async (t) => {
diff --git a/library/vulnerabilities/sql-injection/checkContextForSqlInjection.test.ts b/library/vulnerabilities/sql-injection/checkContextForSqlInjection.test.ts
index fd536e73d..3b239b7c7 100644
--- a/library/vulnerabilities/sql-injection/checkContextForSqlInjection.test.ts
+++ b/library/vulnerabilities/sql-injection/checkContextForSqlInjection.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { checkContextForSqlInjection } from "./checkContextForSqlInjection";
 import { SQLDialectMySQL } from "./dialects/SQLDialectMySQL";
 
diff --git a/library/vulnerabilities/sql-injection/config.test.ts b/library/vulnerabilities/sql-injection/config.test.ts
index ca2ead6a6..37e7acc32 100644
--- a/library/vulnerabilities/sql-injection/config.test.ts
+++ b/library/vulnerabilities/sql-injection/config.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import {
   SQL_DANGEROUS_IN_STRING,
   SQL_ESCAPE_SEQUENCES,
diff --git a/library/vulnerabilities/sql-injection/detectSQLInjection.mysql.test.ts b/library/vulnerabilities/sql-injection/detectSQLInjection.mysql.test.ts
index 224abe79e..e37524cee 100644
--- a/library/vulnerabilities/sql-injection/detectSQLInjection.mysql.test.ts
+++ b/library/vulnerabilities/sql-injection/detectSQLInjection.mysql.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { detectSQLInjection } from "./detectSQLInjection";
 import { SQLDialectMySQL } from "./dialects/SQLDialectMySQL";
 
diff --git a/library/vulnerabilities/sql-injection/detectSQLInjection.postgres.test.ts b/library/vulnerabilities/sql-injection/detectSQLInjection.postgres.test.ts
index d9ee2a2f7..7dce7fb79 100644
--- a/library/vulnerabilities/sql-injection/detectSQLInjection.postgres.test.ts
+++ b/library/vulnerabilities/sql-injection/detectSQLInjection.postgres.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { detectSQLInjection } from "./detectSQLInjection";
 import { SQLDialectPostgres } from "./dialects/SQLDialectPostgres";
 
diff --git a/library/vulnerabilities/sql-injection/detectSQLInjection.sqlite.test.ts b/library/vulnerabilities/sql-injection/detectSQLInjection.sqlite.test.ts
index e5e940f7a..1e8602393 100644
--- a/library/vulnerabilities/sql-injection/detectSQLInjection.sqlite.test.ts
+++ b/library/vulnerabilities/sql-injection/detectSQLInjection.sqlite.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { detectSQLInjection } from "./detectSQLInjection";
 import { SQLDialectSQLite } from "./dialects/SQLDialectSQLite";
 
diff --git a/library/vulnerabilities/sql-injection/detectSQLInjection.test.ts b/library/vulnerabilities/sql-injection/detectSQLInjection.test.ts
index 488de3d0a..b04062410 100644
--- a/library/vulnerabilities/sql-injection/detectSQLInjection.test.ts
+++ b/library/vulnerabilities/sql-injection/detectSQLInjection.test.ts
@@ -1,5 +1,5 @@
 import { basename, join } from "path";
-import * as t from "tap";
+import t from "tap";
 import { readFileSync } from "fs";
 import { escapeStringRegexp } from "../../helpers/escapeStringRegexp";
 import { SQL_DANGEROUS_IN_STRING, SQL_KEYWORDS } from "./config";
diff --git a/library/vulnerabilities/sql-injection/dialects/SQLDialect.test.ts b/library/vulnerabilities/sql-injection/dialects/SQLDialect.test.ts
index 17ac5d1a6..df446c330 100644
--- a/library/vulnerabilities/sql-injection/dialects/SQLDialect.test.ts
+++ b/library/vulnerabilities/sql-injection/dialects/SQLDialect.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { SQLDialectMySQL } from "./SQLDialectMySQL";
 import { SQLDialectPostgres } from "./SQLDialectPostgres";
 
diff --git a/library/vulnerabilities/sql-injection/queryContainsUserInput.test.ts b/library/vulnerabilities/sql-injection/queryContainsUserInput.test.ts
index 681a29870..080315bc2 100644
--- a/library/vulnerabilities/sql-injection/queryContainsUserInput.test.ts
+++ b/library/vulnerabilities/sql-injection/queryContainsUserInput.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { queryContainsUserInput } from "./queryContainsUserInput";
 
 t.test("it checks if query contains user input", async () => {
diff --git a/library/vulnerabilities/sql-injection/userInputContainsSQLSyntax.test.ts b/library/vulnerabilities/sql-injection/userInputContainsSQLSyntax.test.ts
index d893ee391..a00028759 100644
--- a/library/vulnerabilities/sql-injection/userInputContainsSQLSyntax.test.ts
+++ b/library/vulnerabilities/sql-injection/userInputContainsSQLSyntax.test.ts
@@ -1,6 +1,6 @@
 import { readFileSync } from "fs";
 import { join } from "path";
-import * as t from "tap";
+import t from "tap";
 import { SQL_DANGEROUS_IN_STRING, SQL_KEYWORDS } from "./config";
 import { SQLDialectMySQL } from "./dialects/SQLDialectMySQL";
 import { SQLDialectPostgres } from "./dialects/SQLDialectPostgres";
diff --git a/library/vulnerabilities/sql-injection/userInputOccurrencesSafelyEncapsulated.test.ts b/library/vulnerabilities/sql-injection/userInputOccurrencesSafelyEncapsulated.test.ts
index 6a9f858e4..daa513557 100644
--- a/library/vulnerabilities/sql-injection/userInputOccurrencesSafelyEncapsulated.test.ts
+++ b/library/vulnerabilities/sql-injection/userInputOccurrencesSafelyEncapsulated.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { userInputOccurrencesSafelyEncapsulated } from "./userInputOccurrencesSafelyEncapsulated";
 
 t.test(
diff --git a/library/vulnerabilities/ssrf/containsPrivateIPAddress.test.ts b/library/vulnerabilities/ssrf/containsPrivateIPAddress.test.ts
index 024c4f606..d763e3a7f 100644
--- a/library/vulnerabilities/ssrf/containsPrivateIPAddress.test.ts
+++ b/library/vulnerabilities/ssrf/containsPrivateIPAddress.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { containsPrivateIPAddress } from "./containsPrivateIPAddress";
 
 const publicIPs = [
diff --git a/library/vulnerabilities/ssrf/findHostnameInUserInput.test.ts b/library/vulnerabilities/ssrf/findHostnameInUserInput.test.ts
index 362777fbe..df25595b6 100644
--- a/library/vulnerabilities/ssrf/findHostnameInUserInput.test.ts
+++ b/library/vulnerabilities/ssrf/findHostnameInUserInput.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { findHostnameInUserInput } from "./findHostnameInUserInput";
 
 t.test("returns false if user input and hostname are empty", async (t) => {
diff --git a/library/vulnerabilities/ssrf/getMetadataForSSRFAttack.test.ts b/library/vulnerabilities/ssrf/getMetadataForSSRFAttack.test.ts
index 32a29bd90..2167562b7 100644
--- a/library/vulnerabilities/ssrf/getMetadataForSSRFAttack.test.ts
+++ b/library/vulnerabilities/ssrf/getMetadataForSSRFAttack.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getMetadataForSSRFAttack } from "./getMetadataForSSRFAttack";
 
 t.test("port is undefined", async () => {
diff --git a/library/vulnerabilities/ssrf/getRedirectOrigin.test.ts b/library/vulnerabilities/ssrf/getRedirectOrigin.test.ts
index e5e47b682..2bd808c4c 100644
--- a/library/vulnerabilities/ssrf/getRedirectOrigin.test.ts
+++ b/library/vulnerabilities/ssrf/getRedirectOrigin.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { getRedirectOrigin } from "./getRedirectOrigin";
 
 t.test("it gets the origin URL of a redirect", async (t) => {
diff --git a/library/vulnerabilities/ssrf/imds.test.ts b/library/vulnerabilities/ssrf/imds.test.ts
index 36b6ccbe8..e11df2964 100644
--- a/library/vulnerabilities/ssrf/imds.test.ts
+++ b/library/vulnerabilities/ssrf/imds.test.ts
@@ -1,4 +1,4 @@
-import * as t from "tap";
+import t from "tap";
 import { isIMDSIPAddress } from "./imds";
 
 t.test("it returns true for IMDS IP addresses", async (t) => {
diff --git a/library/vulnerabilities/ssrf/inspectDNSLookupCalls.test.ts b/library/vulnerabilities/ssrf/inspectDNSLookupCalls.test.ts
index ab186ea13..18e66131d 100644
--- a/library/vulnerabilities/ssrf/inspectDNSLookupCalls.test.ts
+++ b/library/vulnerabilities/ssrf/inspectDNSLookupCalls.test.ts
@@ -1,5 +1,5 @@
 import { LookupAddress, lookup } from "dns";
-import * as t from "tap";
+import t from "tap";
 import { Agent } from "../../agent/Agent";
 import { ReportingAPIForTesting } from "../../agent/api/ReportingAPIForTesting";
 import { Token } from "../../agent/api/Token";