diff --git a/server/src/lib/score-import/framework/milestones/milestones.test.ts b/server/src/lib/score-import/framework/milestones/milestones.test.ts
index ab1293db4..5f066f5de 100644
--- a/server/src/lib/score-import/framework/milestones/milestones.test.ts
+++ b/server/src/lib/score-import/framework/milestones/milestones.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../../../../external/mongo/db";
 import CreateLogCtx from "../../../logger/logger";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { TestingIIDXSPMilestone } from "../../../../test-utils/test-data";
 import { UpdateUsersMilestones } from "./milestones";
 import { GoalImportInfo } from "kamaitachi-common";
@@ -11,11 +11,11 @@ import { CloseAllConnections } from "../../../../test-utils/close-connections";
 const logger = CreateLogCtx(__filename);
 
 function CreateMockGII(...garr: [string, boolean][]) {
-    return (garr.map((e) => ({
+    return garr.map((e) => ({
         goalID: e[0],
         old: {},
         new: { achieved: e[1] },
-    })) as unknown) as GoalImportInfo[];
+    })) as unknown as GoalImportInfo[];
 }
 
 t.test("#UpdateUsersMilestones", (t) => {
diff --git a/server/src/lib/score-import/framework/orphans/orphans.test.ts b/server/src/lib/score-import/framework/orphans/orphans.test.ts
index 2d95cd075..498407836 100644
--- a/server/src/lib/score-import/framework/orphans/orphans.test.ts
+++ b/server/src/lib/score-import/framework/orphans/orphans.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../../../../external/mongo/db";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import CreateLogCtx from "../../../logger/logger";
 import { BatchManualContext, BatchManualScore } from "../../import-types/common/batch-manual/types";
 import { OrphanScore, ReprocessOrphan } from "./orphans";
diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts
index 0dced6004..bd63087cc 100644
--- a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts
+++ b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import db from "../../../../external/mongo/db";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../../test-utils/test-data";
 import { CreatePBDoc } from "./create-pb-doc";
 import deepmerge from "deepmerge";
@@ -149,9 +149,9 @@ t.test("#CreatePBDoc", (t) => {
 
     t.test("Should bail safely if no score exists when one should", async (t) => {
         // a work of genius
-        const fakeLogger = ({
+        const fakeLogger = {
             severe: () => (severeCalled = true),
-        } as unknown) as KtLogger;
+        } as unknown as KtLogger;
 
         let severeCalled = false;
 
diff --git a/server/src/lib/score-import/framework/pb/process-pbs.test.ts b/server/src/lib/score-import/framework/pb/process-pbs.test.ts
index 6eb95b3a8..f9e6e594f 100644
--- a/server/src/lib/score-import/framework/pb/process-pbs.test.ts
+++ b/server/src/lib/score-import/framework/pb/process-pbs.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../../../../external/mongo/db";
 import CreateLogCtx from "../../../logger/logger";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { Testing511SPA, TestingIIDXSPScore } from "../../../../test-utils/test-data";
 import { ProcessPBs } from "./process-pbs";
 import deepmerge from "deepmerge";
diff --git a/server/src/lib/score-import/framework/score-importing/insert-score.test.ts b/server/src/lib/score-import/framework/score-importing/insert-score.test.ts
index af1ef9a38..1f7104e00 100644
--- a/server/src/lib/score-import/framework/score-importing/insert-score.test.ts
+++ b/server/src/lib/score-import/framework/score-importing/insert-score.test.ts
@@ -2,7 +2,7 @@ import { ScoreDocument } from "kamaitachi-common";
 import t from "tap";
 import db from "../../../../external/mongo/db";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { InsertQueue, QueueScoreInsert } from "./insert-score";
 
 // these two get the same tests, because they're too closely linked
@@ -16,7 +16,7 @@ t.test("#QueueScoreInsert, #InsertQueue", async (t) => {
 
     t.test("Single Queue Test", async (t) => {
         // fake score doc
-        const res = await QueueScoreInsert(({ scoreID: "foo" } as unknown) as ScoreDocument);
+        const res = await QueueScoreInsert({ scoreID: "foo" } as unknown as ScoreDocument);
 
         t.equal(
             res,
@@ -49,13 +49,13 @@ t.test("#QueueScoreInsert, #InsertQueue", async (t) => {
     t.test("Queue Overflow Test", async (t) => {
         for (let i = 0; i < 499; i++) {
             // eslint-disable-next-line no-await-in-loop
-            await QueueScoreInsert(({ scoreID: i, chartID: "test" } as unknown) as ScoreDocument);
+            await QueueScoreInsert({ scoreID: i, chartID: "test" } as unknown as ScoreDocument);
         }
 
-        const overflowRes = await QueueScoreInsert(({
+        const overflowRes = await QueueScoreInsert({
             scoreID: "foo",
             chartID: "test",
-        } as unknown) as ScoreDocument);
+        } as unknown as ScoreDocument);
 
         t.equal(
             overflowRes,
@@ -86,11 +86,11 @@ t.test("#QueueScoreInsert, #InsertQueue", async (t) => {
     t.equal(r, 0, "Queue should be empty after test.");
 
     t.test("Queue Dedupe Test", async (t) => {
-        await QueueScoreInsert(({ scoreID: 1, chartID: "foo" } as unknown) as ScoreDocument);
-        const r2 = await QueueScoreInsert(({
+        await QueueScoreInsert({ scoreID: 1, chartID: "foo" } as unknown as ScoreDocument);
+        const r2 = await QueueScoreInsert({
             scoreID: 1,
             chartID: "foo",
-        } as unknown) as ScoreDocument);
+        } as unknown as ScoreDocument);
 
         t.equal(r2, null, "Should return null when a duplicate scoreID is submitted");
 
diff --git a/server/src/lib/score-import/framework/score-importing/score-id.test.ts b/server/src/lib/score-import/framework/score-importing/score-id.test.ts
index 54b05bccd..832b9f724 100644
--- a/server/src/lib/score-import/framework/score-importing/score-id.test.ts
+++ b/server/src/lib/score-import/framework/score-importing/score-id.test.ts
@@ -1,7 +1,7 @@
 import { ScoreDocument } from "kamaitachi-common";
 import t from "tap";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { Testing511SPA, TestingIIDXSPDryScore } from "../../../../test-utils/test-data";
 import { CreateScoreID, GetWithScoreID } from "./score-id";
 
diff --git a/server/src/lib/score-import/framework/sessions/sessions.test.ts b/server/src/lib/score-import/framework/sessions/sessions.test.ts
index 3a2a39927..161eb8f69 100644
--- a/server/src/lib/score-import/framework/sessions/sessions.test.ts
+++ b/server/src/lib/score-import/framework/sessions/sessions.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../../../../external/mongo/db";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { TestingIIDXSPScore, TestingIIDXSPScorePB } from "../../../../test-utils/test-data";
 import { CreateScoreLogger } from "../common/import-logger";
 import { CreateSessions, LoadScoresIntoSessions } from "./sessions";
@@ -164,16 +164,9 @@ t.test("#LoadScoresIntoSessions", (t) => {
         const res = await LoadScoresIntoSessions(
             1,
             "ir/direct-manual",
-            [
-                null,
-                start,
-                start - 4000,
-                start + 2000,
-                start - 3000,
-                null,
-                start + 1000,
-            ].map((e, i) =>
-                deepmerge(TestingIIDXSPScore, { timeAchieved: e, scoreID: `SCORE_ID_${i}` })
+            [null, start, start - 4000, start + 2000, start - 3000, null, start + 1000].map(
+                (e, i) =>
+                    deepmerge(TestingIIDXSPScore, { timeAchieved: e, scoreID: `SCORE_ID_${i}` })
             ) as ScoreDocument[],
             "iidx",
             "SP",
diff --git a/server/src/lib/score-import/framework/user-game-stats/classes.test.ts b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts
index ba7c3b2d8..a9e1a2471 100644
--- a/server/src/lib/score-import/framework/user-game-stats/classes.test.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts
@@ -1,7 +1,7 @@
 import { UserGameStats } from "kamaitachi-common";
 import t from "tap";
 import CreateLogCtx from "../../../logger/logger";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { CalculateClassDeltas, UpdateUGSClasses } from "./classes";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 import { GitadoraColours } from "../../../constants/classes";
@@ -88,7 +88,7 @@ t.test("#CalculateClassDeltas", (t) => {
         const res = CalculateClassDeltas(
             "SP",
             { dan: 18 },
-            ({ classes: { dan: 17 } } as unknown) as UserGameStats,
+            { classes: { dan: 17 } } as unknown as UserGameStats,
             1,
             logger
         );
@@ -109,7 +109,7 @@ t.test("#CalculateClassDeltas", (t) => {
         const res = CalculateClassDeltas(
             "SP",
             { dan: 18 },
-            ({ classes: { dan: 18 } } as unknown) as UserGameStats,
+            { classes: { dan: 18 } } as unknown as UserGameStats,
             1,
             logger
         );
@@ -123,7 +123,7 @@ t.test("#CalculateClassDeltas", (t) => {
         const res = CalculateClassDeltas(
             "SP",
             { dan: 16 },
-            ({ classes: { dan: 18 } } as unknown) as UserGameStats,
+            { classes: { dan: 18 } } as unknown as UserGameStats,
             1,
             logger
         );
diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.test.ts b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts
index 3e7b3a0be..a9a769f38 100644
--- a/server/src/lib/score-import/framework/user-game-stats/rating.test.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts
@@ -1,5 +1,5 @@
 import t from "tap";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { CalculateRatings } from "./rating";
 import CreateLogCtx from "../../../logger/logger";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
diff --git a/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts
index d6308dff9..af8e252de 100644
--- a/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../../../../external/mongo/db";
 import CreateLogCtx from "../../../logger/logger";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { UpdateUsersGamePlaytypeStats } from "./update-ugs";
 import deepmerge from "deepmerge";
 import crypto from "crypto";
diff --git a/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts b/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts
index 33eb98b91..54293911b 100644
--- a/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts
+++ b/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { GetKTDataJSON } from "../../../../../test-utils/test-data";
 import CreateLogCtx from "../../../../logger/logger";
 import { ConvertAPIArcDDR, ResolveARCDDRLamp } from "./converter";
diff --git a/server/src/lib/score-import/import-types/api/arc-ddr/parser.test.ts b/server/src/lib/score-import/import-types/api/arc-ddr/parser.test.ts
index 63926536f..7fd97d619 100644
--- a/server/src/lib/score-import/import-types/api/arc-ddr/parser.test.ts
+++ b/server/src/lib/score-import/import-types/api/arc-ddr/parser.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 import { agta } from "../../../../../test-utils/misc";
 import { MockJSONFetch } from "../../../../../test-utils/mock-fetch";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../logger/logger";
 import { ParseArcDDR } from "./parser";
 
@@ -15,8 +15,7 @@ t.test("#ParseArcDDR", (t) => {
         const mockArcAPI = MockJSONFetch({
             "https://arc.example.com/api/v1/ddr/16/player_bests?profile_id=profile": {
                 _links: {
-                    _next:
-                        "https://arc.example.com/api/v1/ddr/16/player_bests?profile_id=profile&page=2",
+                    _next: "https://arc.example.com/api/v1/ddr/16/player_bests?profile_id=profile&page=2",
                 },
                 _items: [1, 2, 3],
             },
diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/class-handler.test.ts b/server/src/lib/score-import/import-types/api/arc-iidx/class-handler.test.ts
index a997b7fa2..479317e30 100644
--- a/server/src/lib/score-import/import-types/api/arc-iidx/class-handler.test.ts
+++ b/server/src/lib/score-import/import-types/api/arc-iidx/class-handler.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 import { MockJSONFetch } from "../../../../../test-utils/mock-fetch";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { IIDXClasses } from "../../../../constants/classes";
 import CreateLogCtx from "../../../../logger/logger";
 import { CreateArcIIDXClassHandler } from "./class-handler";
diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts b/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts
index d69ef4ab2..be72c75fc 100644
--- a/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts
+++ b/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data";
 import CreateLogCtx from "../../../../logger/logger";
 import { ConvertAPIArcIIDX, ResolveARCIIDXLamp } from "./converter";
diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/parser.test.ts b/server/src/lib/score-import/import-types/api/arc-iidx/parser.test.ts
index 9c75eb434..9d6de57fc 100644
--- a/server/src/lib/score-import/import-types/api/arc-iidx/parser.test.ts
+++ b/server/src/lib/score-import/import-types/api/arc-iidx/parser.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 import { agta } from "../../../../../test-utils/misc";
 import { MockJSONFetch } from "../../../../../test-utils/mock-fetch";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../logger/logger";
 import { ParseArcIIDX } from "./parser";
 
@@ -15,8 +15,7 @@ t.test("#ParseArcIIDX", (t) => {
         const mockArcAPI = MockJSONFetch({
             "https://arc.example.com/api/v1/iidx/27/player_bests?profile_id=profile": {
                 _links: {
-                    _next:
-                        "https://arc.example.com/api/v1/iidx/27/player_bests?profile_id=profile&page=2",
+                    _next: "https://arc.example.com/api/v1/iidx/27/player_bests?profile_id=profile&page=2",
                 },
                 _items: [1, 2, 3],
             },
diff --git a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts
index 3b44d96ca..78c099a53 100644
--- a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts
+++ b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import {
     GetKTDataJSON,
     TestingAlbidaADV,
diff --git a/server/src/lib/score-import/import-types/api/arc-sdvx/parser.test.ts b/server/src/lib/score-import/import-types/api/arc-sdvx/parser.test.ts
index 272aeb22e..780497ca2 100644
--- a/server/src/lib/score-import/import-types/api/arc-sdvx/parser.test.ts
+++ b/server/src/lib/score-import/import-types/api/arc-sdvx/parser.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 import { agta } from "../../../../../test-utils/misc";
 import { MockJSONFetch } from "../../../../../test-utils/mock-fetch";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../logger/logger";
 import { ParseArcSDVX } from "./parser";
 
@@ -15,8 +15,7 @@ t.test("#ParseArcSDVX", (t) => {
         const mockArcAPI = MockJSONFetch({
             "https://arc.example.com/api/v1/sdvx/5/player_bests?profile_id=profile": {
                 _links: {
-                    _next:
-                        "https://arc.example.com/api/v1/sdvx/5/player_bests?profile_id=profile&page=2",
+                    _next: "https://arc.example.com/api/v1/sdvx/5/player_bests?profile_id=profile&page=2",
                 },
                 _items: [1, 2, 3],
             },
diff --git a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts
index c980dc97b..2a321583d 100644
--- a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts
+++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../../test-utils/resets";
 import {
     GetKTDataJSON,
     Testing511Song,
diff --git a/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.test.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.test.ts
index cf2e0eb70..93d29d081 100644
--- a/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.test.ts
+++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../../test-utils/close-connections";
 import { MockJSONFetch } from "../../../../../../test-utils/mock-fetch";
-import ResetDBState from "../../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../../logger/logger";
 import { ParseKaiIIDX } from "./parser";
 
diff --git a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts
index 48d6b134e..698a28e91 100644
--- a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts
+++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../../test-utils/resets";
 import {
     GetKTDataJSON,
     TestingAlbidaADV,
diff --git a/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.test.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.test.ts
index 228f1705a..9e19ab026 100644
--- a/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.test.ts
+++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../../test-utils/close-connections";
 import { MockJSONFetch } from "../../../../../../test-utils/mock-fetch";
-import ResetDBState from "../../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../../logger/logger";
 import { ParseKaiSDVX } from "./parser";
 
diff --git a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.test.ts b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.test.ts
index 4885b994a..fa454535e 100644
--- a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.test.ts
+++ b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 import { agta } from "../../../../../test-utils/misc";
 import { MockJSONFetch } from "../../../../../test-utils/mock-fetch";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../logger/logger";
 import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
 import { TraverseKaiAPI } from "./traverse-api";
diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts
index bff036078..00d60a67f 100644
--- a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts
+++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts
@@ -5,7 +5,7 @@ import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual }
 import deepmerge from "deepmerge";
 import { EscapeStringRegexp } from "../../../../../utils/misc";
 import { Game } from "kamaitachi-common";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { InvalidScoreFailure } from "../../../framework/common/converter-failures";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 
diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts
index 80195281e..6c2fa7ea9 100644
--- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts
+++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import CreateLogCtx from "../../../../logger/logger";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 
 const logger = CreateLogCtx(__filename);
diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts b/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts
index 7993395e2..6307bfd69 100644
--- a/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts
+++ b/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../../../../../external/mongo/db";
 import CreateLogCtx from "../../../../logger/logger";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import {
     GetKTDataJSON,
     LoadKTBlackIIDXData,
diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts b/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts
index 6597ad9a9..d0ae8c0eb 100644
--- a/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts
+++ b/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import CreateLogCtx from "../../../../logger/logger";
 import { MockMulterFile } from "../../../../../test-utils/mock-multer";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { GetKTDataBuffer, GetKTDataJSON } from "../../../../../test-utils/test-data";
 import { ParseMerIIDX } from "./parser";
 import deepmerge from "deepmerge";
diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts
index 26e9e54b0..2698cb9d0 100644
--- a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts
+++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import CreateLogCtx from "../../../../logger/logger";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import {
     GetKTDataJSON,
     LoadKTBlackIIDXData,
diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts
index c8c0992af..104d229a7 100644
--- a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts
+++ b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import CreateLogCtx from "../../../../logger/logger";
 import { MockMulterFile } from "../../../../../test-utils/mock-multer";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { GetKTDataBuffer } from "../../../../../test-utils/test-data";
 import { ParseSolidStateXML } from "./parser";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
diff --git a/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts b/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts
index 936e915fd..52ecf165e 100644
--- a/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts
+++ b/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import db from "../../../../../external/mongo/db";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../logger/logger";
 import { ConverterIRBarbatos } from "./converter";
 import deepmerge from "deepmerge";
diff --git a/server/src/lib/score-import/import-types/ir/barbatos/parser.test.ts b/server/src/lib/score-import/import-types/ir/barbatos/parser.test.ts
index 611ae52a0..8ed0a5dbf 100644
--- a/server/src/lib/score-import/import-types/ir/barbatos/parser.test.ts
+++ b/server/src/lib/score-import/import-types/ir/barbatos/parser.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { barbScore } from "../../../../../test-utils/test-data";
 import CreateLogCtx from "../../../../logger/logger";
 import { ParseBarbatosSingle } from "./parser";
@@ -11,7 +11,7 @@ t.test("#ParseBarbatosSingle", (t) => {
     t.beforeEach(ResetDBState);
 
     t.test("Should return the score as a payload", (t) => {
-        const res = ParseBarbatosSingle((barbScore as unknown) as Record<string, unknown>, logger);
+        const res = ParseBarbatosSingle(barbScore as unknown as Record<string, unknown>, logger);
 
         t.hasStrict(res, {
             game: "sdvx",
diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.test.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.test.ts
index ba32ade08..19c143264 100644
--- a/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.test.ts
+++ b/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import CreateLogCtx from "../../../../logger/logger";
 import { CreateFerStaticClassHandler } from "./class-handler";
 
diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.test.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.test.ts
index ac38331bb..5e9c6095a 100644
--- a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.test.ts
+++ b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { GetKTDataJSON } from "../../../../../test-utils/test-data";
 import CreateLogCtx from "../../../../logger/logger";
 import { ParseFervidexStatic } from "./parser";
diff --git a/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts
index 26603ea40..72362c2c6 100644
--- a/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts
+++ b/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../../../../../external/mongo/db";
 import CreateLogCtx from "../../../../logger/logger";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data";
 import { InternalFailure } from "../../../framework/common/converter-failures";
 import {
diff --git a/server/src/lib/score-import/import-types/ir/usc/converter.test.ts b/server/src/lib/score-import/import-types/ir/usc/converter.test.ts
index a5bddea7c..df8c0369b 100644
--- a/server/src/lib/score-import/import-types/ir/usc/converter.test.ts
+++ b/server/src/lib/score-import/import-types/ir/usc/converter.test.ts
@@ -4,7 +4,7 @@ import { ConverterIRUSC, DeriveLamp, DeriveNoteMod } from "./converter";
 import d from "deepmerge";
 import { uscChart, uscScore } from "../../../../../test-utils/test-data";
 import CreateLogCtx from "../../../../logger/logger";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { USCClientScore } from "../../../../../server/router/ir/usc/usc";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 
diff --git a/server/src/server/router/api/v1/auth/auth.test.ts b/server/src/server/router/api/v1/auth/auth.test.ts
index fb4e869b3..09442c582 100644
--- a/server/src/server/router/api/v1/auth/auth.test.ts
+++ b/server/src/server/router/api/v1/auth/auth.test.ts
@@ -1,7 +1,7 @@
 import { CreateInviteCode, AddNewInvite, ReinstateInvite, ValidateCaptcha } from "./auth";
 import t from "tap";
 import db from "../../../../../external/mongo/db";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { MockBasicFetch } from "../../../../../test-utils/mock-fetch";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 
diff --git a/server/src/server/router/api/v1/auth/router.test.ts b/server/src/server/router/api/v1/auth/router.test.ts
index 30ad1a0a6..c0abfe08a 100644
--- a/server/src/server/router/api/v1/auth/router.test.ts
+++ b/server/src/server/router/api/v1/auth/router.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import db from "../../../../../external/mongo/db";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 import mockApi from "../../../../../test-utils/mock-api";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 
 t.test("POST /api/v1/auth/status", (t) => {
     t.beforeEach(ResetDBState);
diff --git a/server/src/server/router/api/v1/import/router.test.ts b/server/src/server/router/api/v1/import/router.test.ts
index c9adc4f13..c2890df8d 100644
--- a/server/src/server/router/api/v1/import/router.test.ts
+++ b/server/src/server/router/api/v1/import/router.test.ts
@@ -9,7 +9,7 @@ import {
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
 import { RequireNeutralAuthentication } from "../../../../../test-utils/api-common";
 import { CreateFakeAuthCookie } from "../../../../../test-utils/fake-session";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import db from "../../../../../external/mongo/db";
 import { SetIndexes } from "../../../../../../scripts/set-indexes";
 
diff --git a/server/src/server/router/ir/barbatos/router.test.ts b/server/src/server/router/ir/barbatos/router.test.ts
index 2827d86b4..c790cc250 100644
--- a/server/src/server/router/ir/barbatos/router.test.ts
+++ b/server/src/server/router/ir/barbatos/router.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import { RequireNeutralAuthentication } from "../../../../test-utils/api-common";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import mockApi from "../../../../test-utils/mock-api";
 import { TestingBarbatosScore } from "../../../../test-utils/test-data";
 import db from "../../../../external/mongo/db";
diff --git a/server/src/server/router/ir/beatoraja/auth.test.ts b/server/src/server/router/ir/beatoraja/auth.test.ts
index 9e6f66839..e00c6ab57 100644
--- a/server/src/server/router/ir/beatoraja/auth.test.ts
+++ b/server/src/server/router/ir/beatoraja/auth.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import { ValidateAuthToken, ValidateIRClientVersion } from "./auth";
 import expMiddlewareMock from "express-request-mock";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { SYMBOL_KtchiData } from "../../../../lib/constants/ktchi";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 
diff --git a/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts b/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts
index 184552180..aef162dad 100644
--- a/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts
+++ b/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import db from "../../../../../external/mongo/db";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import { GetKTDataJSON } from "../../../../../test-utils/test-data";
 import { KtchiPBScoreToBeatorajaFormat } from "./convert-scores";
 import { ScoreDocument, PBScoreDocument } from "kamaitachi-common";
@@ -10,7 +10,7 @@ import { CloseAllConnections } from "../../../../../test-utils/close-connections
 
 const gazerChart = GetKTDataJSON("./kamaitachi/bms-gazer-chart.json");
 
-const pbScore = ({
+const pbScore = {
     composedFrom: {
         lampPB: "mock_lampPB",
     },
@@ -23,7 +23,7 @@ const pbScore = ({
     scoreMeta: {},
     chartID: gazerChart.chartID,
     userID: 1,
-} as unknown) as PBScoreDocument<"bms:7K" | "bms:14K">;
+} as unknown as PBScoreDocument<"bms:7K" | "bms:14K">;
 
 t.test("#KtchiPBScoreToBeatorajaFormat", (t) => {
     t.beforeEach(ResetDBState);
diff --git a/server/src/server/router/ir/beatoraja/charts/router.test.ts b/server/src/server/router/ir/beatoraja/charts/router.test.ts
index 52b2a7d85..05ddf2296 100644
--- a/server/src/server/router/ir/beatoraja/charts/router.test.ts
+++ b/server/src/server/router/ir/beatoraja/charts/router.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseAllConnections } from "../../../../../test-utils/close-connections";
-import ResetDBState from "../../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../../test-utils/resets";
 import mockApi from "../../../../../test-utils/mock-api";
 import db from "../../../../../external/mongo/db";
 
diff --git a/server/src/server/router/ir/beatoraja/router.test.ts b/server/src/server/router/ir/beatoraja/router.test.ts
index 86953f89d..6154f366c 100644
--- a/server/src/server/router/ir/beatoraja/router.test.ts
+++ b/server/src/server/router/ir/beatoraja/router.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import db from "../../../../external/mongo/db";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 import mockApi from "../../../../test-utils/mock-api";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { GetKTDataJSON } from "../../../../test-utils/test-data";
 import deepmerge from "deepmerge";
 
diff --git a/server/src/server/router/ir/chunitachi/router.test.ts b/server/src/server/router/ir/chunitachi/router.test.ts
index 05748ad6d..b66a64c02 100644
--- a/server/src/server/router/ir/chunitachi/router.test.ts
+++ b/server/src/server/router/ir/chunitachi/router.test.ts
@@ -4,7 +4,7 @@ import { RequireNeutralAuthentication } from "../../../../test-utils/api-common"
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session";
 import mockApi from "../../../../test-utils/mock-api";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { GetKTDataJSON } from "../../../../test-utils/test-data";
 import deepmerge from "deepmerge";
 
diff --git a/server/src/server/router/ir/direct-manual/router.test.ts b/server/src/server/router/ir/direct-manual/router.test.ts
index b9b8f7561..690422678 100644
--- a/server/src/server/router/ir/direct-manual/router.test.ts
+++ b/server/src/server/router/ir/direct-manual/router.test.ts
@@ -4,7 +4,7 @@ import { RequireNeutralAuthentication } from "../../../../test-utils/api-common"
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session";
 import mockApi from "../../../../test-utils/mock-api";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { GetKTDataJSON } from "../../../../test-utils/test-data";
 
 t.test("POST /ir/direct-manual/import", async (t) => {
diff --git a/server/src/server/router/ir/fervidex/router.test.ts b/server/src/server/router/ir/fervidex/router.test.ts
index 32f44e8d7..73e7385e8 100644
--- a/server/src/server/router/ir/fervidex/router.test.ts
+++ b/server/src/server/router/ir/fervidex/router.test.ts
@@ -3,7 +3,7 @@ import db from "../../../../external/mongo/db";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session";
 import mockApi from "../../../../test-utils/mock-api";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { GetKTDataJSON } from "../../../../test-utils/test-data";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/server/src/server/router/ir/usc/router.test.ts b/server/src/server/router/ir/usc/router.test.ts
index b1634002f..4e083b583 100644
--- a/server/src/server/router/ir/usc/router.test.ts
+++ b/server/src/server/router/ir/usc/router.test.ts
@@ -2,7 +2,7 @@ import t from "tap";
 import db from "../../../../external/mongo/db";
 import { CloseAllConnections } from "../../../../test-utils/close-connections";
 import mockApi from "../../../../test-utils/mock-api";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import deepmerge from "deepmerge";
 import { PBScoreDocument, ScoreDocument } from "kamaitachi-common";
 import { GetKTDataBuffer } from "../../../../test-utils/test-data";
@@ -345,10 +345,12 @@ t.test("POST /replays", (t) => {
             scoreID: "MOCK_IDENTIFIER",
         } as ScoreDocument);
 
+        const replayFile = GetKTDataBuffer("./usc/replayfile.urf");
+
         const res = await mockApi
             .post("/ir/usc/replays")
             .field("identifier", "MOCK_IDENTIFIER")
-            .field("replay", GetKTDataBuffer("./usc/replayfile.urf"))
+            .attach("replay", replayFile, "replay.urf")
             .set("Authorization", "Bearer foo");
 
         t.equal(res.status, 200);
@@ -361,6 +363,8 @@ t.test("POST /replays", (t) => {
 
         const stored = await RetrieveCDN("/uscir/replays/MOCK_IDENTIFIER");
 
+        t.strictSame(stored, replayFile, "Should store the same file exactly.");
+
         t.end();
     });
 
diff --git a/server/src/server/router/ir/usc/usc.test.ts b/server/src/server/router/ir/usc/usc.test.ts
index 56308b6f3..52957181d 100644
--- a/server/src/server/router/ir/usc/usc.test.ts
+++ b/server/src/server/router/ir/usc/usc.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import db from "../../../../external/mongo/db";
-import ResetDBState from "../../../../test-utils/reset-db-state";
+import ResetDBState from "../../../../test-utils/resets";
 import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc";
 import { ChartDocument, PBScoreDocument, ScoreDocument } from "kamaitachi-common";
 import deepmerge from "deepmerge";
@@ -116,7 +116,8 @@ t.test("#KtchiScoreToServerScore", (t) => {
 
     t.test("Should throw if scorePB document does not exist.", (t) => {
         t.rejects(() => KtchiScoreToServerScore(mockScorePB), {
-            message: /Score USC_EXAMPLE_SCORE_PB_ID does not exist, but is referenced in 1's PBDoc on/u,
+            message:
+                /Score USC_EXAMPLE_SCORE_PB_ID does not exist, but is referenced in 1's PBDoc on/u,
         } as any);
 
         t.end();
diff --git a/server/src/test-utils/reset-db-state.ts b/server/src/test-utils/resets.ts
similarity index 100%
rename from server/src/test-utils/reset-db-state.ts
rename to server/src/test-utils/resets.ts
diff --git a/server/src/utils/db.test.ts b/server/src/utils/db.test.ts
index 98a417f83..b10fbc038 100644
--- a/server/src/utils/db.test.ts
+++ b/server/src/utils/db.test.ts
@@ -1,7 +1,7 @@
 import { GetNextCounterValue } from "./db";
 import t from "tap";
 import db from "../external/mongo/db";
-import ResetDBState from "../test-utils/reset-db-state";
+import ResetDBState from "../test-utils/resets";
 import { CloseAllConnections } from "../test-utils/close-connections";
 
 t.test("#GetNextCounterValue", (t) => {
diff --git a/server/src/utils/folder.test.ts b/server/src/utils/folder.test.ts
index b8564116f..4118a5390 100644
--- a/server/src/utils/folder.test.ts
+++ b/server/src/utils/folder.test.ts
@@ -9,7 +9,7 @@ import {
     ResolveFolderToCharts,
 } from "./folder";
 import db from "../external/mongo/db";
-import ResetDBState from "../test-utils/reset-db-state";
+import ResetDBState from "../test-utils/resets";
 import deepmerge from "deepmerge";
 import { CloseAllConnections } from "../test-utils/close-connections";
 
@@ -46,9 +46,7 @@ t.test("#ResolveFolderToCharts", (t) => {
                 data: [],
             };
 
-            const { charts } = await ResolveFolderToCharts(
-                (mockFolder as unknown) as FolderDocument
-            );
+            const { charts } = await ResolveFolderToCharts(mockFolder as unknown as FolderDocument);
 
             t.equal(charts.length, 0, "Should return exactly 0 charts.");
 
@@ -86,9 +84,7 @@ t.test("#ResolveFolderToCharts", (t) => {
                 },
             };
 
-            const { charts } = await ResolveFolderToCharts(
-                (mockFolder as unknown) as FolderDocument
-            );
+            const { charts } = await ResolveFolderToCharts(mockFolder as unknown as FolderDocument);
 
             t.equal(charts.length, 0, "Should return exactly 0 charts.");
             t.end();
diff --git a/server/src/utils/goal.test.ts b/server/src/utils/goal.test.ts
index 62dc20db1..40eb2e555 100644
--- a/server/src/utils/goal.test.ts
+++ b/server/src/utils/goal.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../external/mongo/db";
 import CreateLogCtx from "../lib/logger/logger";
-import ResetDBState from "../test-utils/reset-db-state";
+import ResetDBState from "../test-utils/resets";
 import { EvaluateGoalForUser } from "./goal";
 import { GoalDocument } from "kamaitachi-common";
 import deepmerge from "deepmerge";
diff --git a/server/src/utils/session.test.ts b/server/src/utils/session.test.ts
index 32403d2fd..551a53f72 100644
--- a/server/src/utils/session.test.ts
+++ b/server/src/utils/session.test.ts
@@ -1,7 +1,7 @@
 import t from "tap";
 import db from "../external/mongo/db";
 import { CloseAllConnections } from "../test-utils/close-connections";
-import ResetDBState from "../test-utils/reset-db-state";
+import ResetDBState from "../test-utils/resets";
 import { GetScoresFromSession } from "./session";
 
 t.test("#GetScoresFromSession", async (t) => {
diff --git a/server/src/utils/user.test.ts b/server/src/utils/user.test.ts
index 5170a8a1d..b68a029e4 100644
--- a/server/src/utils/user.test.ts
+++ b/server/src/utils/user.test.ts
@@ -4,7 +4,7 @@ import { prAssert } from "../test-utils/asserts";
 import { GetUserCaseInsensitive, PRIVATEINFO_GetUserCaseInsensitive, FormatUserDoc } from "./user";
 import { PublicUserDocument } from "kamaitachi-common";
 import { CloseAllConnections } from "../test-utils/close-connections";
-import ResetDBState from "../test-utils/reset-db-state";
+import ResetDBState from "../test-utils/resets";
 
 t.test("#GetUserCaseInsensitive", (t) => {
     t.beforeEach(ResetDBState);