diff --git a/test/resolvers/EtaResolverTests.test.ts b/test/resolvers/EtaResolverTests.test.ts
index a90814e..57d6735 100644
--- a/test/resolvers/EtaResolverTests.test.ts
+++ b/test/resolvers/EtaResolverTests.test.ts
@@ -4,7 +4,7 @@ import { UnoptimizedInMemoryRepository } from "../../src/repositories/Unoptimize
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { ServerContext } from "../../src/ServerContext";
 import { IEta, IShuttle, IStop, ISystem } from "../../src/entities/entities";
-import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import { addMockStopToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 import { generateMockEtas, generateMockShuttles, generateMockStops } from "../generators";
 import assert = require("node:assert");
 
@@ -30,10 +30,7 @@ describe("EtaResolvers", () => {
     mockShuttle.systemId = mockSystem.id;
     await repository.addOrUpdateShuttle(mockShuttle);
 
-    const mockStops = generateMockStops();
-    mockStop = mockStops[0];
-    mockStop.systemId = mockSystem.id;
-    await repository.addOrUpdateStop(mockStop);
+    mockStop = await addMockStopToRepository(repository, mockSystem.id);
 
     const etas = generateMockEtas();
     expectedEta = etas[0];
diff --git a/test/resolvers/OrderedStopResolverTests.test.ts b/test/resolvers/OrderedStopResolverTests.test.ts
index d26f7bc..3a96891 100644
--- a/test/resolvers/OrderedStopResolverTests.test.ts
+++ b/test/resolvers/OrderedStopResolverTests.test.ts
@@ -12,7 +12,7 @@ import {
   generateMockSystems
 } from "../generators";
 import assert = require("node:assert");
-import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import { addMockRouteToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 
 describe("OrderedStopResolvers", () => {
   let testServer: ApolloServer<ServerContext>;
@@ -29,14 +29,9 @@ describe("OrderedStopResolvers", () => {
 
   beforeEach(async () => {
     mockSystem = await addMockSystemToRepository(repository);
-
-    const mockRoutes = generateMockRoutes();
-    mockRoute = mockRoutes[0];
-    mockRoute.id = "1";
-    await repository.addOrUpdateRoute(mockRoute);
+    mockRoute = await addMockRouteToRepository(repository, mockSystem.id);
 
     mockStops = generateMockStops();
-
     await Promise.all(mockStops.map(async (mockStop) => {
       await repository.addOrUpdateStop(mockStop);
     }));
diff --git a/test/resolvers/RouteResolverTests.test.ts b/test/resolvers/RouteResolverTests.test.ts
index e445cb7..fa5e24a 100644
--- a/test/resolvers/RouteResolverTests.test.ts
+++ b/test/resolvers/RouteResolverTests.test.ts
@@ -3,7 +3,11 @@ import { ServerContext } from "../../src/ServerContext";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { ApolloServer } from "@apollo/server";
-import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import {
+  addMockRouteToRepository,
+  addMockStopToRepository,
+  addMockSystemToRepository
+} from "../testHelpers/repositorySetupHelpers";
 import { generateMockOrderedStops, generateMockRoutes, generateMockShuttles, generateMockStops } from "../generators";
 import { IRoute, IStop, ISystem } from "../../src/entities/entities";
 import assert = require("node:assert");
@@ -23,16 +27,10 @@ describe("RouteResolvers", () => {
 
   beforeEach(async () => {
     mockSystem = await addMockSystemToRepository(repository);
+    const systemId = mockSystem.id;
 
-    const mockRoutes = generateMockRoutes();
-    mockRoute = mockRoutes[0];
-    mockRoute.systemId = mockSystem.id;
-    await repository.addOrUpdateRoute(mockRoute);
-
-    const mockStops = generateMockStops();
-    mockStop = mockStops[0];
-    mockStop.systemId = mockSystem.id;
-    await repository.addOrUpdateStop(mockStop);
+    mockRoute = await addMockRouteToRepository(repository, systemId);
+    mockStop = await addMockStopToRepository(repository, systemId);
   });
 
 
diff --git a/test/resolvers/StopResolverTests.test.ts b/test/resolvers/StopResolverTests.test.ts
index 392fd24..ef3ea93 100644
--- a/test/resolvers/StopResolverTests.test.ts
+++ b/test/resolvers/StopResolverTests.test.ts
@@ -6,7 +6,7 @@ import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { generateMockEtas, generateMockOrderedStops, generateMockStops, generateMockSystems } from "../generators";
 import { IStop, ISystem } from "../../src/entities/entities";
 import assert = require("node:assert");
-import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import { addMockStopToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 
 describe("StopResolvers", () => {
   let testServer: ApolloServer<ServerContext>;
@@ -22,11 +22,7 @@ describe("StopResolvers", () => {
 
   beforeEach(async () => {
     mockSystem = await addMockSystemToRepository(repository);
-
-    const mockStops = generateMockStops();
-    mockStop = mockStops[0];
-    mockStop.id = "1";
-    await repository.addOrUpdateStop(mockStop);
+    mockStop = await addMockStopToRepository(repository, mockSystem.id);
   })
 
   async function getResponseForQuery(query: string) {
diff --git a/test/testHelpers/repositorySetupHelpers.ts b/test/testHelpers/repositorySetupHelpers.ts
index 65175be..efff0eb 100644
--- a/test/testHelpers/repositorySetupHelpers.ts
+++ b/test/testHelpers/repositorySetupHelpers.ts
@@ -1,6 +1,5 @@
-import { ISystem } from "../../src/entities/entities";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
-import { generateMockSystems } from "../generators";
+import { generateMockRoutes, generateMockStops, generateMockSystems } from "../generators";
 
 export async function addMockSystemToRepository(repository: UnoptimizedInMemoryRepository) {
   const mockSystems = generateMockSystems();
@@ -10,3 +9,22 @@ export async function addMockSystemToRepository(repository: UnoptimizedInMemoryR
 
   return mockSystem;
 }
+
+export async function addMockRouteToRepository(repository: UnoptimizedInMemoryRepository, systemId: string) {
+  const mockRoutes = generateMockRoutes();
+  const mockRoute = mockRoutes[0];
+  mockRoute.systemId = systemId;
+  await repository.addOrUpdateRoute(mockRoute);
+
+  return mockRoute;
+}
+
+export async function addMockStopToRepository(repository: UnoptimizedInMemoryRepository, systemId: string) {
+  const mockStops = generateMockStops();
+  const mockStop = mockStops[0];
+  mockStop.systemId = systemId;
+  await repository.addOrUpdateStop(mockStop);
+
+  return mockStop;
+}
+