diff --git a/packages/bundler-sdk/test/populateBundle.test.ts b/packages/bundler-sdk/test/populateBundle.test.ts
index bde2ad92..c025b562 100644
--- a/packages/bundler-sdk/test/populateBundle.test.ts
+++ b/packages/bundler-sdk/test/populateBundle.test.ts
@@ -1167,7 +1167,7 @@ describe("populateBundle", () => {
         async ({ client, config }) => {
           const { id } = usdc_wstEth;
           const collateralAssets = parseEther("100");
-          const loanShares = parseUnits("50000", 12);
+          const loanShares = parseUnits("5000", 12);
           const loanAssets = (await fetchMarket(id, client)).toBorrowAssets(
             loanShares,
           );
@@ -3628,7 +3628,7 @@ describe("populateBundle", () => {
         async ({ client, config }) => {
           const { id } = usdc_wstEth;
           const collateralAssets = parseEther("100");
-          const loanShares = parseUnits("50000", 12);
+          const loanShares = parseUnits("5000", 12);
           const loanAssets = (await fetchMarket(id, client)).toBorrowAssets(
             loanShares,
           );
diff --git a/packages/test-viem/src/trace.ts b/packages/test-viem/src/trace.ts
index 1e6d5aa0..20824d4a 100644
--- a/packages/test-viem/src/trace.ts
+++ b/packages/test-viem/src/trace.ts
@@ -3,7 +3,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import "colors";
 import { writeFile } from "node:fs/promises";
-import { red, yellow } from "colors";
+import { grey, red, yellow } from "colors";
 import {
   type Address,
   type BlockTag,
@@ -149,9 +149,9 @@ export const formatCallTrace = (trace: RpcCallTrace, level = 1): string => {
     .map((subtrace) => formatCallTrace(subtrace, level + 1))
     .join("\n");
 
-  const error = trace.revertReason ?? trace.output;
+  const returnValue = trace.revertReason ?? trace.output;
 
-  return `${level === 1 ? `${getIndentLevel(level, true)}FROM ${trace.from.grey}\n`.cyan : ""}${getIndentLevel(level, true)}${trace.type.yellow} ${trace.from === trace.to ? ("self").grey : `(${trace.to.white})`}.${formatCallSignature(trace, level)}${error ? ` -> ${error}`.red : ""}
+  return `${level === 1 ? `${getIndentLevel(level, true)}FROM ${trace.from.grey}\n`.cyan : ""}${getIndentLevel(level, true)}${trace.type.yellow} ${trace.from === trace.to ? ("self").grey : `(${trace.to.white})`}.${formatCallSignature(trace, level)}${returnValue ? (trace.error ? red : grey)(` -> ${returnValue}`) : ""}
 ${rest}`;
 };
 
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
index a1122542..e1430de2 100644
--- a/vitest.workspace.ts
+++ b/vitest.workspace.ts
@@ -53,9 +53,8 @@ export default defineWorkspace([
     test: {
       name: "bundler-sdk",
       include: ["packages/bundler-sdk/**/*.test.ts"],
-      exclude: ["packages/bundler-sdk/test/services/**/*.test.ts"],
       environment: "happy-dom",
-      testTimeout: 60_000,
+      testTimeout: 30_000,
     },
   },
   {