diff --git a/package.json b/package.json
index 4a4a2dcbfb084..01673142919c7 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "lerna": "lerna",
     "dev": "turbo run dev --parallel",
     "test-types": "tsc",
-    "test-unit": "jest test/unit/",
+    "test-unit": "jest test/unit/ packages/next/ packages/font",
     "test-dev": "cross-env NEXT_TEST_MODE=dev pnpm testheadless",
     "test-start": "cross-env NEXT_TEST_MODE=start pnpm testheadless",
     "test-deploy": "cross-env NEXT_TEST_MODE=deploy pnpm testheadless",
diff --git a/packages/next/src/client/components/router-reducer/reducers/navigate-reducer.test.tsx b/packages/next/src/client/components/router-reducer/reducers/navigate-reducer.test.tsx
index b86254950d126..e7162d8d53670 100644
--- a/packages/next/src/client/components/router-reducer/reducers/navigate-reducer.test.tsx
+++ b/packages/next/src/client/components/router-reducer/reducers/navigate-reducer.test.tsx
@@ -931,9 +931,9 @@ describe('navigateReducer', () => {
           ],
         },
         // TODO-APP: optimistic tree is wrong
-        // undefined,
-        // undefined,
-        // true,
+        undefined,
+        undefined,
+        true,
       ],
     }
 
diff --git a/packages/next/src/server/future/route-handler-managers/route-handler-manager.test.ts b/packages/next/src/server/future/route-handler-managers/route-handler-manager.test.ts
index 8df7e9a0e62d4..426395441842b 100644
--- a/packages/next/src/server/future/route-handler-managers/route-handler-manager.test.ts
+++ b/packages/next/src/server/future/route-handler-managers/route-handler-manager.test.ts
@@ -65,7 +65,13 @@ describe('RouteHandlerManager', () => {
     }
 
     expect(await handlers.handle(route, req, res)).toEqual(true)
-    expect(handler.handle).toHaveBeenCalledWith(route, req, res)
+    expect(handler.handle).toHaveBeenCalledWith(
+      route,
+      req,
+      res,
+      undefined,
+      undefined
+    )
   })
 
   it('will throw when multiple handlers are added for the same type', () => {
@@ -95,7 +101,13 @@ describe('RouteHandlerManager', () => {
     }
 
     expect(await handlers.handle(route, req, res)).toEqual(true)
-    expect(goodHandler.handle).toBeCalledWith(route, req, res)
+    expect(goodHandler.handle).toBeCalledWith(
+      route,
+      req,
+      res,
+      undefined,
+      undefined
+    )
     expect(badHandler.handle).not.toBeCalled()
   })
 })