diff --git a/examples/02-simple-transfer-with-inputs/tests/task.spec.ts b/examples/02-simple-transfer-with-inputs/tests/task.spec.ts
index 9668773..6fc1ea7 100644
--- a/examples/02-simple-transfer-with-inputs/tests/task.spec.ts
+++ b/examples/02-simple-transfer-with-inputs/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { fp, OpType } from '@mimicprotocol/sdk'
+import { fp, OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, runTask, Transfer } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -6,17 +6,17 @@ describe('Task', () => {
   const taskDir = './build'
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 10 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 10 }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     chainId: 10, // Optimism
-    token: '0x7f5c764cbc14f9669b88837ca1490cca17c31607', // USDC
-    amount: '1.5', // 1.5 USDC
-    recipient: '0xbce3248ede29116e4bd18416dcc2dfca668eeb84',
-    maxFee: '0.1', // 0.1 USDC
+    token: randomEvmAddress(),
+    amount: '1.5', // 1.5 tokens
+    recipient: randomEvmAddress(),
+    maxFee: '0.1', // 0.1 tokens
   }
 
   const calls: ContractCallMock[] = [
diff --git a/examples/03-transfer-balance-threshold/tests/task.spec.ts b/examples/03-transfer-balance-threshold/tests/task.spec.ts
index a36560f..0d23f5d 100644
--- a/examples/03-transfer-balance-threshold/tests/task.spec.ts
+++ b/examples/03-transfer-balance-threshold/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { fp, OpType } from '@mimicprotocol/sdk'
+import { fp, OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, runTask, Transfer } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -6,18 +6,18 @@ describe('Task', () => {
   const taskDir = './build'
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 10 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 10 }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     chainId: 10, // Optimism
-    token: '0x7f5c764cbc14f9669b88837ca1490cca17c31607', // USDC
-    amount: '1', // 1 USDC
-    recipient: '0xbce3248ede29116e4bd18416dcc2dfca668eeb84',
-    maxFee: '0.1', // 0.1 USDC
-    threshold: '10.2', // 10.2 USDC
+    token: randomEvmAddress(),
+    amount: '1', // 1 token
+    recipient: randomEvmAddress(),
+    maxFee: '0.1', // 0.1 tokens
+    threshold: '10.2', // 10.2 tokens
   }
 
   const buildCalls = (balance: string): ContractCallMock[] => [
@@ -52,7 +52,7 @@ describe('Task', () => {
   ]
 
   describe('when the balance is below the threshold', () => {
-    const balance = '9000000' // 9 USDC
+    const balance = '9000000' // 9 tokens
     const calls = buildCalls(balance)
 
     it('produces the expected intents', async () => {
@@ -79,7 +79,7 @@ describe('Task', () => {
   })
 
   describe('when the balance is above the threshold', () => {
-    const balance = '11000000' // 11 USDC
+    const balance = '11000000' // 11 tokens
     const calls = buildCalls(balance)
 
     it('does not produce any intent', async () => {
diff --git a/examples/04-transfer-balance-threshold-with-oracles/tests/task.spec.ts b/examples/04-transfer-balance-threshold-with-oracles/tests/task.spec.ts
index 51ae567..81095b5 100644
--- a/examples/04-transfer-balance-threshold-with-oracles/tests/task.spec.ts
+++ b/examples/04-transfer-balance-threshold-with-oracles/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { fp, OpType } from '@mimicprotocol/sdk'
+import { fp, OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, GetPriceMock, runTask, Transfer } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -6,17 +6,17 @@ describe('Task', () => {
   const taskDir = './build'
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 10 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 10 }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     chainId: 10, // Optimism
-    token: '0x7f5c764cbc14f9669b88837ca1490cca17c31607', // USDC
-    amount: '1', // 1 USDC
-    recipient: '0xbce3248ede29116e4bd18416dcc2dfca668eeb84',
-    maxFee: '0.1', // 0.1 USDC
+    token: randomEvmAddress(),
+    amount: '1', // 1 token
+    recipient: randomEvmAddress(),
+    maxFee: '0.1', // 0.1 tokens
     thresholdUsd: '10.5', // 10.5 USD
   }
 
@@ -26,7 +26,7 @@ describe('Task', () => {
         token: inputs.token,
         chainId: inputs.chainId,
       },
-      response: ['1000000000000000000'], // 1 USD = 1 USDC
+      response: ['1000000000000000000'], // 1 token = 1 USD
     },
   ]
 
@@ -62,7 +62,7 @@ describe('Task', () => {
   ]
 
   describe('when the balance is below the threshold', () => {
-    const balance = '9000000' // 9 USDC
+    const balance = '9000000' // 9 tokens
     const calls = buildCalls(balance)
 
     it('produces the expected intents', async () => {
@@ -92,7 +92,7 @@ describe('Task', () => {
   })
 
   describe('when the balance is above the threshold', () => {
-    const balance = '11000000' // 11 USDC
+    const balance = '11000000' // 11 tokens
     const calls = buildCalls(balance)
 
     it('does not produce any intent', async () => {
diff --git a/examples/05-invest-aave-idle-balance/tests/task.spec.ts b/examples/05-invest-aave-idle-balance/tests/task.spec.ts
index 3204c2f..67c6de3 100644
--- a/examples/05-invest-aave-idle-balance/tests/task.spec.ts
+++ b/examples/05-invest-aave-idle-balance/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { EvmCallIntent, OpType } from '@mimicprotocol/sdk'
+import { EvmCallIntent, OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, GetPriceMock, runTask } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 import { Interface } from 'ethers'
@@ -13,21 +13,21 @@ describe('Task', () => {
   const taskDir = './build'
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 10 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 10 }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     chainId: 10, // Optimism
-    aToken: '0x625e7708f30ca75bfd92586e17077590c60eb4cd', // Aave Optimism USDC
-    smartAccount: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a1',
+    aToken: randomEvmAddress(), // Aave Optimism USDC
+    smartAccount: randomEvmAddress(),
     thresholdUsd: '10.5', // 10.5 USD
     maxFeeUsd: '0.1', // 0.1 USD
   }
 
-  const underlyingToken = '0x7f5c764cbc14f9669b88837ca1490cca17c31607' // USDC
-  const pool = '0x794a61358d6845594f94dc1db02a252b5b4814ad' // Aave Pool
+  const underlyingToken = randomEvmAddress() // USDC
+  const aavePool = randomEvmAddress()
 
   const prices: GetPriceMock[] = [
     {
@@ -35,14 +35,14 @@ describe('Task', () => {
         token: inputs.aToken,
         chainId: inputs.chainId,
       },
-      response: ['1000000000000000000'], // 1 USD = 1 aOptUSDC
+      response: ['1000000000000000000'], // 1 aOptUSDC = 1 USD
     },
     {
       request: {
         token: underlyingToken,
         chainId: inputs.chainId,
       },
-      response: ['1000000000000000000'], // 1 USD = 1 USDC
+      response: ['1000000000000000000'], // 1 USDC = 1 USD
     },
   ]
 
@@ -66,7 +66,7 @@ describe('Task', () => {
         fnSelector: '0x7535d246', // `POOL`
       },
       response: {
-        value: pool,
+        value: aavePool,
         abiType: 'address',
       },
     },
@@ -166,7 +166,7 @@ describe('Task', () => {
       expect(intents[0].user).to.be.equal(inputs.smartAccount)
       expect(intents[0].chainId).to.be.equal(inputs.chainId)
 
-      const expectedApproveData = ERC20Interface.encodeFunctionData('approve', [pool, balance])
+      const expectedApproveData = ERC20Interface.encodeFunctionData('approve', [aavePool, balance])
       expect(intents[0].calls[0].target).to.be.equal(underlyingToken)
       expect(intents[0].calls[0].value).to.be.equal('0')
       expect(intents[0].calls[0].data).to.be.equal(expectedApproveData)
@@ -177,7 +177,7 @@ describe('Task', () => {
         inputs.smartAccount,
         0,
       ])
-      expect(intents[0].calls[1].target).to.be.equal(pool)
+      expect(intents[0].calls[1].target).to.be.equal(aavePool)
       expect(intents[0].calls[1].value).to.be.equal('0')
       expect(intents[0].calls[1].data).to.be.equal(expectedSupplyData)
 
diff --git a/examples/06-withdraw-from-aave-balance-threshold/tests/task.spec.ts b/examples/06-withdraw-from-aave-balance-threshold/tests/task.spec.ts
index 59773e8..ea4e076 100644
--- a/examples/06-withdraw-from-aave-balance-threshold/tests/task.spec.ts
+++ b/examples/06-withdraw-from-aave-balance-threshold/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { OpType } from '@mimicprotocol/sdk'
+import { OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, GetPriceMock, runTask, Swap } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -6,20 +6,20 @@ describe('Task', () => {
   const taskDir = './build'
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 10 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 10 }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     chainId: 10, // Optimism
-    aToken: '0x625e7708f30ca75bfd92586e17077590c60eb4cd', // Aave Optimism USDC
+    aToken: randomEvmAddress(), // Aave Optimism USDC
     slippageBps: 200, // 2%
     thresholdUsd: '10', // 10 USD
-    recipient: '0xbce3248ede29116e4bd18416dcc2dfca668eeb84',
+    recipient: randomEvmAddress(),
   }
 
-  const underlyingToken = '0x7f5c764cbc14f9669b88837ca1490cca17c31607' // USDC
+  const underlyingToken = randomEvmAddress() // USDC
 
   const prices: GetPriceMock[] = [
     {
@@ -27,14 +27,14 @@ describe('Task', () => {
         token: inputs.aToken,
         chainId: inputs.chainId,
       },
-      response: ['1000000000000000000'], // 1 USD = 1 aOptUSDC
+      response: ['1000000000000000000'], // 1 aOptUSDC = 1 USD
     },
     {
       request: {
         token: underlyingToken,
         chainId: inputs.chainId,
       },
-      response: ['1000000000000000000'], // 1 USD = 1 USDC
+      response: ['1000000000000000000'], // 1 USDC = 1 USD
     },
   ]
 
diff --git a/examples/07-withdraw-from-aave-swap-and-transfer/manifest.yaml b/examples/07-withdraw-from-aave-swap-and-transfer/manifest.yaml
index c004d50..9b923e9 100644
--- a/examples/07-withdraw-from-aave-swap-and-transfer/manifest.yaml
+++ b/examples/07-withdraw-from-aave-swap-and-transfer/manifest.yaml
@@ -2,7 +2,7 @@ version: 1.0.0
 name: Claim-Swap-Transfer Loop Task
 description: This task is for demo purposes. It withdraws from AAVE, swaps for an AAVE token and transfer to deposit in loop
 inputs:
-  - usdFeeAmount: string
+  - maxFeeUsdt: string      # e.g., '0.5' = 0.5 USDT
   - smartAccount: address
 abis:
   - AavePool: ./abis/AavePool.json
diff --git a/examples/07-withdraw-from-aave-swap-and-transfer/src/task.ts b/examples/07-withdraw-from-aave-swap-and-transfer/src/task.ts
index ee4a3fc..87abca1 100644
--- a/examples/07-withdraw-from-aave-swap-and-transfer/src/task.ts
+++ b/examples/07-withdraw-from-aave-swap-and-transfer/src/task.ts
@@ -47,13 +47,13 @@ export default function main(): void {
   const usdcUser = findTokenAmount(userTokens, USDC)
   const aUsdcUser = findTokenAmount(userTokens, aUSDC)
 
-  const feeUsdt = TokenAmount.fromStringDecimal(USDT, inputs.usdFeeAmount)
+  const maxFeeUsdt = TokenAmount.fromStringDecimal(USDT, inputs.maxFeeUsdt)
 
   if (aUsdcSmartAccount && aUsdcSmartAccount.amount > BigInt.zero()) {
     // Claim aUSDC to user EOA using USDC in smart account
     aaveV3Pool
       .withdraw(USDC.address, aUsdcSmartAccount.amount, context.user)
-      .addMaxFee(feeUsdt)
+      .addMaxFee(maxFeeUsdt)
       .addUser(inputs.smartAccount)
       .build()
       .send()
@@ -73,7 +73,7 @@ export default function main(): void {
     // Transfer aUSDC from user EOA to smart account
     TransferBuilder.forChain(chainId)
       .addTransfer(new TransferData(aUSDC.address, aUsdcUser.amount, inputs.smartAccount))
-      .addMaxFee(feeUsdt)
+      .addMaxFee(maxFeeUsdt)
       .build()
       .send()
   }
diff --git a/examples/07-withdraw-from-aave-swap-and-transfer/tests/task.spec.ts b/examples/07-withdraw-from-aave-swap-and-transfer/tests/task.spec.ts
index 45f5344..eab24c0 100644
--- a/examples/07-withdraw-from-aave-swap-and-transfer/tests/task.spec.ts
+++ b/examples/07-withdraw-from-aave-swap-and-transfer/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { Chains, OpType } from '@mimicprotocol/sdk'
+import { Chains, OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import {
   Call,
   Context,
@@ -23,15 +23,15 @@ describe('Task', () => {
   }
 
   const context: Context = {
-    user: '0xae7168deb525862f4fee37d987a971b385b96952',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 10 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 10 }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     chainId,
-    smartAccount: '0x863df6bfa4469f3ead0be8f9f2aae51c91a907b4',
-    usdFeeAmount: '1', // 1 USD in USDT
+    smartAccount: randomEvmAddress(),
+    maxFeeUsdt: '1', // 1 USDT
   }
 
   const calls: ContractCallMock[] = [
diff --git a/examples/08-relevant-tokens-query/manifest.yaml b/examples/08-relevant-tokens-query/manifest.yaml
index d56ebde..a44fb6c 100644
--- a/examples/08-relevant-tokens-query/manifest.yaml
+++ b/examples/08-relevant-tokens-query/manifest.yaml
@@ -3,5 +3,5 @@ name: Relevant tokens query example
 description: Example of how to use the relevant tokens query
 inputs:
   - chainId: int32
-  - feeAmountUsd: string     # e.g., '1.5' = 1.5 USD
+  - maxFeeUsd: string     # e.g., '1.5' = 1.5 USD
   - recipient: address
diff --git a/examples/08-relevant-tokens-query/src/task.ts b/examples/08-relevant-tokens-query/src/task.ts
index d631e96..9b55616 100644
--- a/examples/08-relevant-tokens-query/src/task.ts
+++ b/examples/08-relevant-tokens-query/src/task.ts
@@ -18,5 +18,5 @@ export default function main(): void {
     return
   }
 
-  builder.addMaxFee(TokenAmount.fromStringDecimal(DenominationToken.USD(), inputs.feeAmountUsd)).build().send()
+  builder.addMaxFee(TokenAmount.fromStringDecimal(DenominationToken.USD(), inputs.maxFeeUsd)).build().send()
 }
diff --git a/examples/08-relevant-tokens-query/tests/task.spec.ts b/examples/08-relevant-tokens-query/tests/task.spec.ts
index 494cbb3..2ac7820 100644
--- a/examples/08-relevant-tokens-query/tests/task.spec.ts
+++ b/examples/08-relevant-tokens-query/tests/task.spec.ts
@@ -16,7 +16,7 @@ describe('Task', () => {
 
   const inputs = {
     chainId,
-    feeAmountUsd: '0.1',
+    maxFeeUsd: '0.1',
     recipient: randomEvmAddress(),
   }
 
diff --git a/examples/09-subgraph-query/tests/task.spec.ts b/examples/09-subgraph-query/tests/task.spec.ts
index b9c8fa9..f641604 100644
--- a/examples/09-subgraph-query/tests/task.spec.ts
+++ b/examples/09-subgraph-query/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { OpType } from '@mimicprotocol/sdk'
+import { OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, runTask, SubgraphQueryMock, Swap } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -6,16 +6,16 @@ describe('Task', () => {
   const taskDir = './build'
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 1 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 1 }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     subgraphId: 'subgraph-id',
     chainId: 1,
-    tokenIn: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', // USDC
-    tokenOut: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // WETH
+    tokenIn: '0xa' + randomEvmAddress().slice(3),
+    tokenOut: '0xb' + randomEvmAddress().slice(3),
     slippageBps: 100, // 1%
   }
 
@@ -72,7 +72,7 @@ describe('Task', () => {
   ]
 
   describe('when the balance is not zero', () => {
-    const balance = '9000000000' // 9000 USDC
+    const balance = '9000000000' // 9000 tokenIn
     const calls = buildCalls(balance)
 
     it('produces the expected intents', async () => {
diff --git a/examples/10-rebalancing-tokens/tests/task.spec.ts b/examples/10-rebalancing-tokens/tests/task.spec.ts
index 935b12a..892ab87 100644
--- a/examples/10-rebalancing-tokens/tests/task.spec.ts
+++ b/examples/10-rebalancing-tokens/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { OpType } from '@mimicprotocol/sdk'
+import { OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { ContractCallMock, runTask, Swap } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -6,14 +6,14 @@ describe('Task', () => {
   const taskDir = './build'
 
   const context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d', chainId: 10 }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId: 10 }],
     timestamp: Date.now(),
   }
 
-  const WBTC = '0x1111111111111111111111111111111111111111' // 8 decimals
-  const WETH = '0x2222222222222222222222222222222222222222' // 18 decimals
-  const DAI = '0x3333333333333333333333333333333333333333' // 18 decimals
+  const WBTC = randomEvmAddress() // 8 decimals
+  const WETH = randomEvmAddress() // 18 decimals
+  const DAI = randomEvmAddress() // 18 decimals
 
   const inputs = {
     chainId: 10,
diff --git a/examples/11-automated-refunds/tests/task.spec.ts b/examples/11-automated-refunds/tests/task.spec.ts
index 64f6aa2..7f71b22 100644
--- a/examples/11-automated-refunds/tests/task.spec.ts
+++ b/examples/11-automated-refunds/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { Chains, fp, OpType } from '@mimicprotocol/sdk'
+import { Chains, fp, OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, runTask, Transfer } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -8,17 +8,17 @@ describe('Task', () => {
   const chainId = Chains.Arbitrum
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0x609d831c0068844e11ef85a273c7f356212fd6d1', chainId }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId }],
     timestamp: Date.now(),
   }
 
   const inputs = {
     chainId,
-    token: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913', // USDC
-    amount: '100', // 100 USDC
-    maxFee: '0.3', // 0.3 USDC
-    recipient: '0xe35e9842fceaca96570b734083f4a58e8f7c5f2a',
+    token: randomEvmAddress(),
+    amount: '100', // 100 tokens
+    maxFee: '0.3', // 0.3 tokens
+    recipient: randomEvmAddress(),
   }
 
   const calls: ContractCallMock[] = [
diff --git a/examples/12-dollar-cost-averaging/tests/task.spec.ts b/examples/12-dollar-cost-averaging/tests/task.spec.ts
index a8d8b82..94a248d 100644
--- a/examples/12-dollar-cost-averaging/tests/task.spec.ts
+++ b/examples/12-dollar-cost-averaging/tests/task.spec.ts
@@ -1,4 +1,4 @@
-import { Chains, fp, OpType } from '@mimicprotocol/sdk'
+import { Chains, fp, OpType, randomEvmAddress } from '@mimicprotocol/sdk'
 import { Context, ContractCallMock, GetPriceMock, runTask, Swap } from '@mimicprotocol/test-ts'
 import { expect } from 'chai'
 
@@ -6,12 +6,12 @@ describe('Task', () => {
   const taskDir = './build'
 
   const chainId = Chains.Base
-  const USDC = '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913'
-  const WETH = '0x4200000000000000000000000000000000000006'
+  const USDC = randomEvmAddress()
+  const WETH = randomEvmAddress()
 
   const context: Context = {
-    user: '0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0',
-    settlers: [{ address: '0x609d831c0068844e11ef85a273c7f356212fd6d1', chainId }],
+    user: randomEvmAddress(),
+    settlers: [{ address: randomEvmAddress(), chainId }],
     timestamp: Date.now(),
   }
 
diff --git a/examples/13-bridge-and-invest-aave/manifest.bridge.yaml b/examples/13-bridge-and-invest-aave/manifest.bridge.yaml
index 17c7ea8..d6d6ee3 100644
--- a/examples/13-bridge-and-invest-aave/manifest.bridge.yaml
+++ b/examples/13-bridge-and-invest-aave/manifest.bridge.yaml
@@ -4,8 +4,8 @@ description: Bridge USDC between Arbitrum, Base and Optimism, and emit a custom
 inputs:
   - sourceChain: uint32
   - destinationChain: uint32
-  - smartAccount: address # Important: The smart account should exist in both chains
-  - amount: string
-  - minAmountOut: string
+  - smartAccount: address   # Important: The smart account should exist in both chains
+  - amount: string          # e.g., '10.5' = 10.5 USDC
+  - minAmountOut: string    # e.g., '10' = 10 USDC
   - feeToken: address
-  - maxFee: string
+  - maxFee: string          # e.g., '0.01' = 0.01 of the given token
diff --git a/examples/13-bridge-and-invest-aave/manifest.invest.yaml b/examples/13-bridge-and-invest-aave/manifest.invest.yaml
index 481c5ab..9fb69d9 100644
--- a/examples/13-bridge-and-invest-aave/manifest.invest.yaml
+++ b/examples/13-bridge-and-invest-aave/manifest.invest.yaml
@@ -5,7 +5,7 @@ inputs:
   - chainId: uint32
   - smartAccount: address
   - feeToken: address
-  - maxFee: string
+  - maxFee: string          # e.g., '0.01' = 0.01 of the given token
 abis:
   - AavePool: ./src/abis/AavePool.json
   - ERC20: ./src/abis/ERC20.json
diff --git a/examples/13-bridge-and-invest-aave/tests/bridge.spec.ts b/examples/13-bridge-and-invest-aave/tests/bridge.spec.ts
index 3b27c0e..9b54e39 100644
--- a/examples/13-bridge-and-invest-aave/tests/bridge.spec.ts
+++ b/examples/13-bridge-and-invest-aave/tests/bridge.spec.ts
@@ -8,8 +8,8 @@ describe('Bridge', () => {
 
   const sourceChain = Chains.Arbitrum
   const destinationChain = Chains.Optimism
-  const arbitrumUsdc = '0xaf88d065e77c8cc2239327c5edb3a432268e5831'
-  const optimismUsdc = '0x0b2c639c533813f4aa9d7837caf62653d097ff85'
+  const sourceUsdc = '0xaf88d065e77c8cc2239327c5edb3a432268e5831'
+  const destinationUsdc = '0x0b2c639c533813f4aa9d7837caf62653d097ff85'
   const decimals = 6
   const settler = randomEvmAddress()
 
@@ -28,17 +28,17 @@ describe('Bridge', () => {
     smartAccount: randomEvmAddress(),
     amount: '10000', // 10,000 USDC
     minAmountOut: '9990', // 9,990 USDC
-    feeToken: '0x94b008aa00579c1307b0ef2c499ad98a8ce58e58', // USDT on destination chain
-    maxFee: '0.5', // 0.5 USDT
+    feeToken: randomEvmAddress(), // On destination chain
+    maxFee: '0.5', // 0.5 feeToken
   }
 
   const calls: ContractCallMock[] = [
     {
-      request: { to: arbitrumUsdc, chainId: sourceChain, fnSelector: '0x313ce567' }, // `decimals`
+      request: { to: sourceUsdc, chainId: sourceChain, fnSelector: '0x313ce567' }, // `decimals`
       response: { value: decimals.toString(), abiType: 'uint8' },
     },
     {
-      request: { to: optimismUsdc, chainId: destinationChain, fnSelector: '0x313ce567' }, // `decimals`
+      request: { to: destinationUsdc, chainId: destinationChain, fnSelector: '0x313ce567' }, // `decimals`
       response: { value: decimals.toString(), abiType: 'uint8' },
     },
     {
@@ -76,12 +76,12 @@ describe('Bridge', () => {
 
         const amount = fp(inputs.amount, decimals).toString()
         expect(intents[0].tokensIn).to.have.lengthOf(1)
-        expect(intents[0].tokensIn[0].token).to.be.equal(arbitrumUsdc)
+        expect(intents[0].tokensIn[0].token).to.be.equal(sourceUsdc)
         expect(intents[0].tokensIn[0].amount).to.be.equal(amount)
 
         const minAmountOut = fp(inputs.minAmountOut, decimals).toString()
         expect(intents[0].tokensOut).to.have.lengthOf(1)
-        expect(intents[0].tokensOut[0].token).to.be.equal(optimismUsdc)
+        expect(intents[0].tokensOut[0].token).to.be.equal(destinationUsdc)
         expect(intents[0].tokensOut[0].minAmount).to.be.equal(minAmountOut)
         expect(intents[0].tokensOut[0].recipient).to.be.equal(inputs.smartAccount)
 
@@ -94,7 +94,7 @@ describe('Bridge', () => {
         const topic = keccak256(toUtf8Bytes('Bridged USDC'))
         expect(intents[0].events[0].topic).to.be.equal(topic)
 
-        const data = AbiCoder.defaultAbiCoder().encode(['address'], [optimismUsdc])
+        const data = AbiCoder.defaultAbiCoder().encode(['address'], [destinationUsdc])
         expect(intents[0].events[0].data).to.be.equal(data)
       })
     })