diff --git a/test/resolvers/EtaResolverTests.test.ts b/test/resolvers/EtaResolverTests.test.ts
index 5c1821d..28c9cdd 100644
--- a/test/resolvers/EtaResolverTests.test.ts
+++ b/test/resolvers/EtaResolverTests.test.ts
@@ -1,15 +1,11 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
-import { ApolloServer } from "@apollo/server";
-import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
-import { setUpTestServer, setupTestServerContext } from "../testHelpers/apolloSetupHelpers";
-import { ServerContext } from "../../src/ServerContext";
+import { setupTestServerContext } from "../testHelpers/apolloSetupHelpers";
 import { IEta, IShuttle, IStop, ISystem } from "../../src/entities/entities";
 import {
   addMockEtaToRepository, addMockShuttleToRepository,
   addMockStopToRepository,
   addMockSystemToRepository
 } from "../testHelpers/repositorySetupHelpers";
-import { generateMockEtas, generateMockShuttles, generateMockStops } from "../generators";
 import assert = require("node:assert");
 
 describe("EtaResolvers", () => {
diff --git a/test/resolvers/OrderedStopResolverTests.test.ts b/test/resolvers/OrderedStopResolverTests.test.ts
index 6640c7a..70e6ec6 100644
--- a/test/resolvers/OrderedStopResolverTests.test.ts
+++ b/test/resolvers/OrderedStopResolverTests.test.ts
@@ -1,18 +1,9 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
-import { ApolloServer } from "@apollo/server";
-import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
-import { ServerContext } from "../../src/ServerContext";
-import { setupTestServerContext, setUpTestServer } from "../testHelpers/apolloSetupHelpers";
+import { setupTestServerContext } from "../testHelpers/apolloSetupHelpers";
 import { IRoute, IStop, ISystem } from "../../src/entities/entities";
-import {
-  generateMockOrderedStops,
-  generateMockRoutes,
-  generateMockShuttles,
-  generateMockStops,
-  generateMockSystems
-} from "../generators";
-import assert = require("node:assert");
+import { generateMockOrderedStops, generateMockStops } from "../generators";
 import { addMockRouteToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import assert = require("node:assert");
 
 describe("OrderedStopResolvers", () => {
   const context = setupTestServerContext();
diff --git a/test/resolvers/QueryResolverTests.test.ts b/test/resolvers/QueryResolverTests.test.ts
index f0e4777..b74cf67 100644
--- a/test/resolvers/QueryResolverTests.test.ts
+++ b/test/resolvers/QueryResolverTests.test.ts
@@ -3,8 +3,8 @@ import { ApolloServer } from "@apollo/server";
 import { ServerContext } from "../../src/ServerContext";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
 import { generateMockSystems } from "../generators";
-import assert = require("node:assert");
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
+import assert = require("node:assert");
 
 // See Apollo documentation for integration test guide
 // https://www.apollographql.com/docs/apollo-server/testing/testing
diff --git a/test/resolvers/RouteResolverTests.test.ts b/test/resolvers/RouteResolverTests.test.ts
index fa5e24a..4dc01d1 100644
--- a/test/resolvers/RouteResolverTests.test.ts
+++ b/test/resolvers/RouteResolverTests.test.ts
@@ -8,7 +8,7 @@ import {
   addMockStopToRepository,
   addMockSystemToRepository
 } from "../testHelpers/repositorySetupHelpers";
-import { generateMockOrderedStops, generateMockRoutes, generateMockShuttles, generateMockStops } from "../generators";
+import { generateMockOrderedStops, generateMockShuttles } from "../generators";
 import { IRoute, IStop, ISystem } from "../../src/entities/entities";
 import assert = require("node:assert");
 
diff --git a/test/resolvers/ShuttleResolverTests.test.ts b/test/resolvers/ShuttleResolverTests.test.ts
index f2be62d..37166c0 100644
--- a/test/resolvers/ShuttleResolverTests.test.ts
+++ b/test/resolvers/ShuttleResolverTests.test.ts
@@ -2,11 +2,11 @@ import { beforeEach, describe, expect, it } from "@jest/globals";
 import { ApolloServer } from "@apollo/server";
 import { ServerContext } from "../../src/ServerContext";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
-import { generateMockEtas, generateMockRoutes, generateMockShuttles, generateMockSystems } from "../generators";
+import { generateMockEtas, generateMockRoutes } from "../generators";
 import { IShuttle, ISystem } from "../../src/entities/entities";
-import assert = require("node:assert");
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { addMockShuttleToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import assert = require("node:assert");
 
 
 describe("ShuttleResolvers", () => {
diff --git a/test/resolvers/StopResolverTests.test.ts b/test/resolvers/StopResolverTests.test.ts
index ef3ea93..ae23676 100644
--- a/test/resolvers/StopResolverTests.test.ts
+++ b/test/resolvers/StopResolverTests.test.ts
@@ -3,10 +3,10 @@ import { ApolloServer } from "@apollo/server";
 import { ServerContext } from "../../src/ServerContext";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
-import { generateMockEtas, generateMockOrderedStops, generateMockStops, generateMockSystems } from "../generators";
+import { generateMockEtas, generateMockOrderedStops } from "../generators";
 import { IStop, ISystem } from "../../src/entities/entities";
-import assert = require("node:assert");
 import { addMockStopToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import assert = require("node:assert");
 
 describe("StopResolvers", () => {
   let testServer: ApolloServer<ServerContext>;
diff --git a/test/resolvers/SystemResolverTests.test.ts b/test/resolvers/SystemResolverTests.test.ts
index 12f1543..f06501a 100644
--- a/test/resolvers/SystemResolverTests.test.ts
+++ b/test/resolvers/SystemResolverTests.test.ts
@@ -5,7 +5,8 @@ import { UnoptimizedInMemoryRepository } from "../../src/repositories/Unoptimize
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../generators";
 import {
-  addMockRouteToRepository, addMockShuttleToRepository,
+  addMockRouteToRepository,
+  addMockShuttleToRepository,
   addMockStopToRepository,
   addMockSystemToRepository
 } from "../testHelpers/repositorySetupHelpers";