diff --git a/testHelpers/setupRouteAndOrderedStopsForShuttleRepository.ts b/testHelpers/setupRouteAndOrderedStopsForShuttleRepository.ts
index a79f28a..8311cfa 100644
--- a/testHelpers/setupRouteAndOrderedStopsForShuttleRepository.ts
+++ b/testHelpers/setupRouteAndOrderedStopsForShuttleRepository.ts
@@ -1,4 +1,4 @@
-import { IOrderedStop } from "../src/entities/ShuttleRepositoryEntities";
+import { IOrderedStop, IStop } from "../src/entities/ShuttleRepositoryEntities";
 import { ShuttleGetterSetterRepository } from "../src/repositories/shuttle/ShuttleGetterSetterRepository";
 
 export async function setupRouteAndOrderedStopsForShuttleRepository(
@@ -15,43 +15,61 @@ export async function setupRouteAndOrderedStopsForShuttleRepository(
   };
   await shuttleRepository.addOrUpdateRoute(route);
 
-  const stop1 = {
+  const stop1: IStop = {
     id: "st1",
     name: "Stop 1",
-    systemId: systemId,
+    systemId,
     coordinates: { latitude: 10.0, longitude: 20.0 },
     updatedTime: new Date(),
   };
-  const stop2 = {
+  const stop2: IStop = {
     id: "st2",
     name: "Stop 2",
-    systemId: systemId,
+    systemId,
     coordinates: { latitude: 15.0, longitude: 25.0 },
     updatedTime: new Date(),
   };
+  const stop3: IStop = {
+    id: "st3",
+    name: "Stop 3",
+    systemId,
+    coordinates: { latitude: 20.0, longitude: 30.0 },
+    updatedTime: new Date(),
+  }
   await shuttleRepository.addOrUpdateStop(stop1);
   await shuttleRepository.addOrUpdateStop(stop2);
+  await shuttleRepository.addOrUpdateStop(stop3);
 
   const orderedStop1: IOrderedStop = {
     routeId: route.id,
     stopId: stop1.id,
     position: 1,
-    systemId: systemId,
+    systemId,
     updatedTime: new Date(),
   };
   const orderedStop2: IOrderedStop = {
     routeId: route.id,
     stopId: stop2.id,
     position: 2,
-    systemId: systemId,
+    systemId,
     updatedTime: new Date(),
   };
+  const orderedStop3: IOrderedStop = {
+    routeId: route.id,
+    stopId: stop3.id,
+    position: 3,
+    systemId,
+    updatedTime: new Date(),
+  }
   orderedStop1.nextStop = orderedStop2;
-  orderedStop1.previousStop = orderedStop2;
-  orderedStop2.nextStop = orderedStop1;
+  orderedStop1.previousStop = orderedStop3;
+  orderedStop2.nextStop = orderedStop3;
   orderedStop2.previousStop = orderedStop1;
+  orderedStop3.nextStop = orderedStop1;
+  orderedStop3.previousStop = orderedStop2;
   await shuttleRepository.addOrUpdateOrderedStop(orderedStop1);
   await shuttleRepository.addOrUpdateOrderedStop(orderedStop2);
+  await shuttleRepository.addOrUpdateOrderedStop(orderedStop3);
 
   return {
     route,