diff --git a/packages/api/src/folder/controller/get_folder_children.test.ts b/packages/api/src/folder/controller/get_folder_children.test.ts
index f96b8d67..ca694d5f 100644
--- a/packages/api/src/folder/controller/get_folder_children.test.ts
+++ b/packages/api/src/folder/controller/get_folder_children.test.ts
@@ -13,12 +13,60 @@ import {
 	mockExtractUserEmailFromAuthToken,
 	mockExtractShareTokenFromHeaders,
 } from "../../../test/middleware_mocks.js";
-import { loadFixtures, clearDatabase } from "./utils_test.js";
 import { db } from "../../database.js";
+import { runFixtures } from "../../../test/run_fixtures.js";
 
 vi.mock("../../database");
 vi.mock("../../middleware");
 
+export const loadFixtures = async (): Promise<void> => {
+	await runFixtures(db, [
+		"folder.fixtures.create_test_accounts",
+		"folder.fixtures.create_test_archives",
+		"folder.fixtures.create_test_account_archives",
+		"folder.fixtures.create_test_locations",
+		"folder.fixtures.create_test_folders",
+		"folder.fixtures.create_test_records",
+		"folder.fixtures.create_test_files",
+		"folder.fixtures.create_test_record_files",
+		"folder.fixtures.create_test_folder_links",
+		"folder.fixtures.create_test_shareby_urls",
+		"folder.fixtures.create_test_accesses",
+		"folder.fixtures.create_test_folder_sizes",
+		"folder.fixtures.create_test_shares",
+		"folder.fixtures.create_test_profile_items",
+		"folder.fixtures.create_test_tags",
+		"folder.fixtures.create_test_tag_links",
+		"folder.fixtures.create_test_invite_shares",
+	]);
+};
+
+export const clearDatabase = async (): Promise<void> => {
+	await db.query(
+		`TRUNCATE
+      event,
+      account_archive,
+      account,
+      archive,
+      folder,
+      folder_link,
+      shareby_url,
+      access,
+      folder_size,
+      locn,
+      share,
+      profile_item,
+      tag,
+      tag_link,
+      record,
+      file,
+      record_file,
+      invite,
+      invite_share
+    CASCADE`,
+	);
+};
+
 describe("GET /folder/{id}/children", () => {
 	const agent = request(app);
 
diff --git a/packages/api/src/folder/controller/get_folder_legacy.test.ts b/packages/api/src/folder/controller/get_folder_legacy.test.ts
index d989cf7d..ddcd54ef 100644
--- a/packages/api/src/folder/controller/get_folder_legacy.test.ts
+++ b/packages/api/src/folder/controller/get_folder_legacy.test.ts
@@ -11,12 +11,60 @@ import {
 	mockExtractUserEmailFromAuthToken,
 	mockExtractShareTokenFromHeaders,
 } from "../../../test/middleware_mocks.js";
-import { loadFixtures, clearDatabase } from "./utils_test.js";
+import { runFixtures } from "../../../test/run_fixtures.js";
 
 vi.mock("../../database");
 vi.mock("../../middleware");
 vi.mock("@stela/logger");
 
+export const loadFixtures = async (): Promise<void> => {
+	await runFixtures(db, [
+		"folder.fixtures.create_test_accounts",
+		"folder.fixtures.create_test_archives",
+		"folder.fixtures.create_test_account_archives",
+		"folder.fixtures.create_test_locations",
+		"folder.fixtures.create_test_folders",
+		"folder.fixtures.create_test_records",
+		"folder.fixtures.create_test_files",
+		"folder.fixtures.create_test_record_files",
+		"folder.fixtures.create_test_folder_links",
+		"folder.fixtures.create_test_shareby_urls",
+		"folder.fixtures.create_test_accesses",
+		"folder.fixtures.create_test_folder_sizes",
+		"folder.fixtures.create_test_shares",
+		"folder.fixtures.create_test_profile_items",
+		"folder.fixtures.create_test_tags",
+		"folder.fixtures.create_test_tag_links",
+		"folder.fixtures.create_test_invite_shares",
+	]);
+};
+
+export const clearDatabase = async (): Promise<void> => {
+	await db.query(
+		`TRUNCATE
+      event,
+      account_archive,
+      account,
+      archive,
+      folder,
+      folder_link,
+      shareby_url,
+      access,
+      folder_size,
+      locn,
+      share,
+      profile_item,
+      tag,
+      tag_link,
+      record,
+      file,
+      record_file,
+      invite,
+      invite_share
+    CASCADE`,
+	);
+};
+
 const testEmail = "test@permanent.org";
 describe("GET /folder (deprecated alias, no pagination)", () => {
 	const agent = request(app);
diff --git a/packages/api/src/folder/controller/get_folder_share_links.test.ts b/packages/api/src/folder/controller/get_folder_share_links.test.ts
index 841c2bb8..3345f593 100644
--- a/packages/api/src/folder/controller/get_folder_share_links.test.ts
+++ b/packages/api/src/folder/controller/get_folder_share_links.test.ts
@@ -16,12 +16,60 @@ import { db } from "../../database.js";
 import { verifyUserAuthentication } from "../../middleware/index.js";
 import type { ShareLink } from "../../share_link/models.js";
 import { mockVerifyUserAuthentication } from "../../../test/middleware_mocks.js";
-import { loadFixtures, clearDatabase } from "./utils_test.js";
+import { runFixtures } from "../../../test/run_fixtures.js";
 
 vi.mock("../../database");
 vi.mock("../../middleware");
 vi.mock("@stela/logger");
 
+export const loadFixtures = async (): Promise<void> => {
+	await runFixtures(db, [
+		"folder.fixtures.create_test_accounts",
+		"folder.fixtures.create_test_archives",
+		"folder.fixtures.create_test_account_archives",
+		"folder.fixtures.create_test_locations",
+		"folder.fixtures.create_test_folders",
+		"folder.fixtures.create_test_records",
+		"folder.fixtures.create_test_files",
+		"folder.fixtures.create_test_record_files",
+		"folder.fixtures.create_test_folder_links",
+		"folder.fixtures.create_test_shareby_urls",
+		"folder.fixtures.create_test_accesses",
+		"folder.fixtures.create_test_folder_sizes",
+		"folder.fixtures.create_test_shares",
+		"folder.fixtures.create_test_profile_items",
+		"folder.fixtures.create_test_tags",
+		"folder.fixtures.create_test_tag_links",
+		"folder.fixtures.create_test_invite_shares",
+	]);
+};
+
+export const clearDatabase = async (): Promise<void> => {
+	await db.query(
+		`TRUNCATE
+      event,
+      account_archive,
+      account,
+      archive,
+      folder,
+      folder_link,
+      shareby_url,
+      access,
+      folder_size,
+      locn,
+      share,
+      profile_item,
+      tag,
+      tag_link,
+      record,
+      file,
+      record_file,
+      invite,
+      invite_share
+    CASCADE`,
+	);
+};
+
 describe("GET /folder/{id}/share_links", () => {
 	const agent = request(app);
 
diff --git a/packages/api/src/folder/controller/get_folders_page.test.ts b/packages/api/src/folder/controller/get_folders_page.test.ts
index 2cf0bec1..93af4871 100644
--- a/packages/api/src/folder/controller/get_folders_page.test.ts
+++ b/packages/api/src/folder/controller/get_folders_page.test.ts
@@ -11,12 +11,60 @@ import {
 	mockExtractUserEmailFromAuthToken,
 	mockExtractShareTokenFromHeaders,
 } from "../../../test/middleware_mocks.js";
-import { loadFixtures, clearDatabase } from "./utils_test.js";
+import { runFixtures } from "../../../test/run_fixtures.js";
 
 vi.mock("../../database");
 vi.mock("../../middleware");
 vi.mock("@stela/logger");
 
+export const loadFixtures = async (): Promise<void> => {
+	await runFixtures(db, [
+		"folder.fixtures.create_test_accounts",
+		"folder.fixtures.create_test_archives",
+		"folder.fixtures.create_test_account_archives",
+		"folder.fixtures.create_test_locations",
+		"folder.fixtures.create_test_folders",
+		"folder.fixtures.create_test_records",
+		"folder.fixtures.create_test_files",
+		"folder.fixtures.create_test_record_files",
+		"folder.fixtures.create_test_folder_links",
+		"folder.fixtures.create_test_shareby_urls",
+		"folder.fixtures.create_test_accesses",
+		"folder.fixtures.create_test_folder_sizes",
+		"folder.fixtures.create_test_shares",
+		"folder.fixtures.create_test_profile_items",
+		"folder.fixtures.create_test_tags",
+		"folder.fixtures.create_test_tag_links",
+		"folder.fixtures.create_test_invite_shares",
+	]);
+};
+
+export const clearDatabase = async (): Promise<void> => {
+	await db.query(
+		`TRUNCATE
+      event,
+      account_archive,
+      account,
+      archive,
+      folder,
+      folder_link,
+      shareby_url,
+      access,
+      folder_size,
+      locn,
+      share,
+      profile_item,
+      tag,
+      tag_link,
+      record,
+      file,
+      record_file,
+      invite,
+      invite_share
+    CASCADE`,
+	);
+};
+
 const testEmail = "test@permanent.org";
 describe("GET /folders", () => {
 	const agent = request(app);
diff --git a/packages/api/src/folder/controller/patch_folder.test.ts b/packages/api/src/folder/controller/patch_folder.test.ts
index be9ffe72..7754d49e 100644
--- a/packages/api/src/folder/controller/patch_folder.test.ts
+++ b/packages/api/src/folder/controller/patch_folder.test.ts
@@ -11,15 +11,63 @@ import {
 import request from "supertest";
 import { app } from "../../app.js";
 import { db } from "../../database.js";
-import { loadFixtures, clearDatabase } from "./utils_test.js";
 import { mockVerifyUserAuthentication } from "../../../test/middleware_mocks.js";
 import { mockSqlCall } from "../../../test/mock_sql.js";
 import type { Folder } from "../models.js";
+import { runFixtures } from "../../../test/run_fixtures.js";
 
 vi.mock("../../database");
 vi.mock("../../middleware");
 vi.mock("@stela/logger");
 
+export const loadFixtures = async (): Promise<void> => {
+	await runFixtures(db, [
+		"folder.fixtures.create_test_accounts",
+		"folder.fixtures.create_test_archives",
+		"folder.fixtures.create_test_account_archives",
+		"folder.fixtures.create_test_locations",
+		"folder.fixtures.create_test_folders",
+		"folder.fixtures.create_test_records",
+		"folder.fixtures.create_test_files",
+		"folder.fixtures.create_test_record_files",
+		"folder.fixtures.create_test_folder_links",
+		"folder.fixtures.create_test_shareby_urls",
+		"folder.fixtures.create_test_accesses",
+		"folder.fixtures.create_test_folder_sizes",
+		"folder.fixtures.create_test_shares",
+		"folder.fixtures.create_test_profile_items",
+		"folder.fixtures.create_test_tags",
+		"folder.fixtures.create_test_tag_links",
+		"folder.fixtures.create_test_invite_shares",
+	]);
+};
+
+export const clearDatabase = async (): Promise<void> => {
+	await db.query(
+		`TRUNCATE
+      event,
+      account_archive,
+      account,
+      archive,
+      folder,
+      folder_link,
+      shareby_url,
+      access,
+      folder_size,
+      locn,
+      share,
+      profile_item,
+      tag,
+      tag_link,
+      record,
+      file,
+      record_file,
+      invite,
+      invite_share
+    CASCADE`,
+	);
+};
+
 describe("patch folder", () => {
 	const agent = request(app);
 
diff --git a/packages/api/src/folder/controller/utils_test.ts b/packages/api/src/folder/controller/utils_test.ts
deleted file mode 100644
index ce0e82e2..00000000
--- a/packages/api/src/folder/controller/utils_test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { db } from "../../database.js";
-import { runFixtures } from "../../../test/run_fixtures.js";
-
-export const loadFixtures = async (): Promise<void> => {
-	await runFixtures(db, [
-		"folder.fixtures.create_test_accounts",
-		"folder.fixtures.create_test_archives",
-		"folder.fixtures.create_test_account_archives",
-		"folder.fixtures.create_test_locations",
-		"folder.fixtures.create_test_folders",
-		"folder.fixtures.create_test_records",
-		"folder.fixtures.create_test_files",
-		"folder.fixtures.create_test_record_files",
-		"folder.fixtures.create_test_folder_links",
-		"folder.fixtures.create_test_shareby_urls",
-		"folder.fixtures.create_test_accesses",
-		"folder.fixtures.create_test_folder_sizes",
-		"folder.fixtures.create_test_shares",
-		"folder.fixtures.create_test_profile_items",
-		"folder.fixtures.create_test_tags",
-		"folder.fixtures.create_test_tag_links",
-		"folder.fixtures.create_test_invite_shares",
-	]);
-};
-
-export const clearDatabase = async (): Promise<void> => {
-	await db.query(
-		`TRUNCATE 
-      event,
-      account_archive,
-      account,
-      archive,
-      folder,
-      folder_link,
-      shareby_url,
-      access,
-      folder_size,
-      locn,
-      share,
-      profile_item,
-      tag,
-      tag_link,
-      record,
-      file,
-      record_file,
-      invite,
-      invite_share
-    CASCADE`,
-	);
-};