diff --git a/src/templates/otoken/utils.ts b/src/templates/otoken/utils.ts
index 49a72976..ab40622d 100644
--- a/src/templates/otoken/utils.ts
+++ b/src/templates/otoken/utils.ts
@@ -90,7 +90,7 @@ export async function createRebaseAPY(
   }
   if (feeOverride) {
     // If an override is set, we need to calculate the fee based on the yield.
-    _fee = (_yield * feeOverride) / (100n - feeOverride)
+    _fee = (_yield * feeOverride) / 100n
   }
 
   if (OUSD_STABLE_OTOKENS.includes(otokenAddress)) {
diff --git a/src/validation/compare.ts b/src/validation/compare.ts
index 3a62ed64..1d52d17d 100644
--- a/src/validation/compare.ts
+++ b/src/validation/compare.ts
@@ -7,17 +7,23 @@ import { jsonify } from '@utils/jsonify'
 export const compare = (expectation: any, actual: any) => {
   // We decide to only care about float decimal accuracy to the 8th.
   expectation = JSON.parse(
-    jsonify(pick(actual, Object.keys(expectation)), (_key, value) =>
+    jsonify(pick(expectation, Object.keys(expectation)), (_key, value) =>
       typeof value === 'number' ? Number(value.toFixed(8)) : value,
     ),
   )
   actual = JSON.parse(
-    jsonify(expectation, (_key, value) => (typeof value === 'number' ? Number(value.toFixed(8)) : value)),
+    jsonify(pick(actual, Object.keys(expectation)), (_key, value) =>
+      typeof value === 'number' ? Number(value.toFixed(8)) : value,
+    ),
   )
+  const diff = detailedDiff(expectation, actual)
   try {
-    assert.deepEqual(expectation, actual)
+    assert(Object.keys(diff.updated).length === 0 && Object.keys(diff.deleted).length === 0)
   } catch (err) {
-    console.log(detailedDiff(expectation, actual))
+    console.log('Validation failed for:', expectation.id)
+    console.log('actual', JSON.stringify(actual, null, 2))
+    console.log('expectation', JSON.stringify(expectation, null, 2))
+    console.log('diff', JSON.stringify(diff, null, 2))
     throw new Error('Expected and actual values do not match')
   }
 }
diff --git a/src/validation/entities.json b/src/validation/entities.json
index 10104437..ad224667 100644
--- a/src/validation/entities.json
+++ b/src/validation/entities.json
@@ -15649,7 +15649,7 @@
       "rateETH": "999353150969924088",
       "rateUSD": "1801930000000000000000",
       "yield": "151780619735038698",
-      "marketCapUSD": 5.005359998037456e+24
+      "marketCapUSD": 5.005359998037456e24
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-06-12",
@@ -15674,7 +15674,7 @@
       "rateETH": "999454180947283524",
       "rateUSD": "1741825224360000000000",
       "yield": "1524976509044705098",
-      "marketCapUSD": 2.2632570278240853e+25
+      "marketCapUSD": 2.2632570278240853e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-07-07",
@@ -15699,7 +15699,7 @@
       "rateETH": "999613706468163769",
       "rateUSD": "1870023800000000000000",
       "yield": "3761187872168264659",
-      "marketCapUSD": 5.6222075804546905e+25
+      "marketCapUSD": 5.6222075804546905e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-08-01",
@@ -15724,7 +15724,7 @@
       "rateETH": "999897552780925927",
       "rateUSD": "1870256052220000000000",
       "yield": "4041485016317553334",
-      "marketCapUSD": 5.396748463468829e+25
+      "marketCapUSD": 5.396748463468829e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-08-26",
@@ -15749,7 +15749,7 @@
       "rateETH": "1000354937948275245",
       "rateUSD": "1646090000000000000000",
       "yield": "3955330858173394652",
-      "marketCapUSD": 7.3121683699279565e+25
+      "marketCapUSD": 7.3121683699279565e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-09-20",
@@ -15774,7 +15774,7 @@
       "rateETH": "999934889156604456",
       "rateUSD": "1622742956000000000000",
       "yield": "5580897653521612296",
-      "marketCapUSD": 7.304177707414969e+25
+      "marketCapUSD": 7.304177707414969e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-10-15",
@@ -15799,7 +15799,7 @@
       "rateETH": "999722578675828066",
       "rateUSD": "1557174517110000000000",
       "yield": "3441060329738544693",
-      "marketCapUSD": 6.193423975754642e+25
+      "marketCapUSD": 6.193423975754642e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-11-09",
@@ -15824,7 +15824,7 @@
       "rateETH": "1001017634375897861",
       "rateUSD": "2130261800000000000000",
       "yield": "5578372597420246774",
-      "marketCapUSD": 9.09727323496757e+25
+      "marketCapUSD": 9.09727323496757e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-12-04",
@@ -15849,7 +15849,7 @@
       "rateETH": "1002336217292407326",
       "rateUSD": "2242826960000000000000",
       "yield": "3659513879697673827",
-      "marketCapUSD": 8.768199281004334e+25
+      "marketCapUSD": 8.768199281004334e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2023-12-29",
@@ -15874,7 +15874,7 @@
       "rateETH": "999825789309822081",
       "rateUSD": "2298891490000000000000",
       "yield": "4141264283799540086",
-      "marketCapUSD": 8.827625121936762e+25
+      "marketCapUSD": 8.827625121936762e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-01-23",
@@ -15899,7 +15899,7 @@
       "rateETH": "1000560561664259166",
       "rateUSD": "2243070000000000000000",
       "yield": "4227974836029061618",
-      "marketCapUSD": 8.880497963496412e+25
+      "marketCapUSD": 8.880497963496412e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-02-17",
@@ -15924,7 +15924,7 @@
       "rateETH": "999870033292339789",
       "rateUSD": "2787720000000000000000",
       "yield": "4139135430315992570",
-      "marketCapUSD": 1.2361651628275004e+26
+      "marketCapUSD": 1.2361651628275004e26
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-03-13",
@@ -15949,7 +15949,7 @@
       "rateETH": "1000497122046554193",
       "rateUSD": "4013360000000000000000",
       "yield": "3876838208551034016",
-      "marketCapUSD": 1.7856923260124585e+26
+      "marketCapUSD": 1.7856923260124585e26
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-04-07",
@@ -15974,7 +15974,7 @@
       "rateETH": "1001901887839927895",
       "rateUSD": "3453200000000000000000",
       "yield": "1988474527590943969",
-      "marketCapUSD": 1.5404323054904264e+26
+      "marketCapUSD": 1.5404323054904264e26
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-05-02",
@@ -15999,7 +15999,7 @@
       "rateETH": "1003271974115651874",
       "rateUSD": "2989809272000000000000",
       "yield": "3520127547881020051",
-      "marketCapUSD": 1.3362869288768426e+26
+      "marketCapUSD": 1.3362869288768426e26
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-05-27",
@@ -16024,7 +16024,7 @@
       "rateETH": "1000707666867987405",
       "rateUSD": "3894620817000000000000",
       "yield": "2587287960188609391",
-      "marketCapUSD": 1.3391876805729447e+26
+      "marketCapUSD": 1.3391876805729447e26
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-06-21",
@@ -16049,7 +16049,7 @@
       "rateETH": "1001164704655150263",
       "rateUSD": "3515830000000000000000",
       "yield": "1890844002877882232",
-      "marketCapUSD": 1.2102487942626684e+26
+      "marketCapUSD": 1.2102487942626684e26
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-07-16",
@@ -16074,7 +16074,7 @@
       "rateETH": "1000134386426238968",
       "rateUSD": "3446485877590000000000",
       "yield": "1694531559184576455",
-      "marketCapUSD": 1.2964058428831713e+26
+      "marketCapUSD": 1.2964058428831713e26
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-08-10",
@@ -16099,7 +16099,7 @@
       "rateETH": "1000027477352903716",
       "rateUSD": "2607560000000000000000",
       "yield": "2634710565831564083",
-      "marketCapUSD": 8.503543503247424e+25
+      "marketCapUSD": 8.503543503247424e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-09-04",
@@ -16124,7 +16124,7 @@
       "rateETH": "999905168263584091",
       "rateUSD": "2448480754830000000000",
       "yield": "3188694896200981008",
-      "marketCapUSD": 8.501118123404264e+25
+      "marketCapUSD": 8.501118123404264e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-09-29",
@@ -16149,7 +16149,7 @@
       "rateETH": "1000003038732513647",
       "rateUSD": "2656320100000000000000",
       "yield": "3734170059110254955",
-      "marketCapUSD": 8.207559680671856e+25
+      "marketCapUSD": 8.207559680671856e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-10-24",
@@ -16174,7 +16174,7 @@
       "rateETH": "1000006828391787971",
       "rateUSD": "2532720000000000000000",
       "yield": "2109800713606809568",
-      "marketCapUSD": 7.681510669630217e+25
+      "marketCapUSD": 7.681510669630217e25
     },
     {
       "id": "1-0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3-2024-11-18",
@@ -16199,7 +16199,7 @@
       "rateETH": "1000012514374210297",
       "rateUSD": "3209524109770000000000",
       "yield": "3935326003973269016",
-      "marketCapUSD": 1.3596566110425472e+26
+      "marketCapUSD": 1.3596566110425472e26
     }
   ],
   "ousd_oTokens": [
@@ -19401,7 +19401,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 4.3412423583378294e+24
+      "marketCapUSD": 4.3412423583378294e24
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-02-23",
@@ -19426,7 +19426,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 6.723988796670423e+24
+      "marketCapUSD": 6.723988796670423e24
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-03-20",
@@ -19451,7 +19451,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 7.131271213763442e+24
+      "marketCapUSD": 7.131271213763442e24
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-04-14",
@@ -19476,7 +19476,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 7.311198032904797e+24
+      "marketCapUSD": 7.311198032904797e24
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-05-09",
@@ -19501,7 +19501,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 7.614200525538813e+24
+      "marketCapUSD": 7.614200525538813e24
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-06-03",
@@ -19526,7 +19526,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 1.820530705446834e+25
+      "marketCapUSD": 1.820530705446834e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-06-28",
@@ -19551,7 +19551,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 1.8936094549100727e+25
+      "marketCapUSD": 1.8936094549100727e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-07-23",
@@ -19576,7 +19576,7 @@
       "rateETH": "0",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 1.8242811762904623e+25
+      "marketCapUSD": 1.8242811762904623e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-08-17",
@@ -19601,7 +19601,7 @@
       "rateETH": "331659333037621",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 1.8972655367033264e+25
+      "marketCapUSD": 1.8972655367033264e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-09-11",
@@ -19626,7 +19626,7 @@
       "rateETH": "306259015499768",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 2.6512342614259638e+25
+      "marketCapUSD": 2.6512342614259638e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-10-06",
@@ -19651,7 +19651,7 @@
       "rateETH": "278914903427001",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 2.6540342614259636e+25
+      "marketCapUSD": 2.6540342614259636e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-10-31",
@@ -19676,7 +19676,7 @@
       "rateETH": "232959872763880",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 2.6549596484224408e+25
+      "marketCapUSD": 2.6549596484224408e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-11-25",
@@ -19701,7 +19701,7 @@
       "rateETH": "221172390608135",
       "rateUSD": "1000000000000000000",
       "yield": "7447499021523371001470",
-      "marketCapUSD": 1.5669909118082183e+26
+      "marketCapUSD": 1.5669909118082183e26
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2021-12-20",
@@ -19726,7 +19726,7 @@
       "rateETH": "254066331637864",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 2.7332862180313932e+26
+      "marketCapUSD": 2.7332862180313932e26
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-01-14",
@@ -19751,7 +19751,7 @@
       "rateETH": "301836970206486",
       "rateUSD": "1000000000000000000",
       "yield": "82203318177728936970109",
-      "marketCapUSD": 2.788802690524185e+26
+      "marketCapUSD": 2.788802690524185e26
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-02-08",
@@ -19776,7 +19776,7 @@
       "rateETH": "320125433292852",
       "rateUSD": "1000000000000000000",
       "yield": "2842245702869170950037",
-      "marketCapUSD": 2.6030339366199785e+26
+      "marketCapUSD": 2.6030339366199785e26
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-03-05",
@@ -19801,7 +19801,7 @@
       "rateETH": "375194207814333",
       "rateUSD": "1000000000000000000",
       "yield": "14625291181390856993388",
-      "marketCapUSD": 1.588113884360829e+26
+      "marketCapUSD": 1.588113884360829e26
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-03-30",
@@ -19826,7 +19826,7 @@
       "rateETH": "295124987972369",
       "rateUSD": "1000000000000000000",
       "yield": "10584034799957950360191",
-      "marketCapUSD": 1.4276043538900176e+26
+      "marketCapUSD": 1.4276043538900176e26
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-04-24",
@@ -19851,7 +19851,7 @@
       "rateETH": "342214272000060",
       "rateUSD": "1000000000000000000",
       "yield": "5388560720457410333912",
-      "marketCapUSD": 8.794901155456673e+25
+      "marketCapUSD": 8.794901155456673e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-05-19",
@@ -19876,7 +19876,7 @@
       "rateETH": "494798291478211",
       "rateUSD": "1000000000000000000",
       "yield": "3356788276141471135994",
-      "marketCapUSD": 6.356734858182233e+25
+      "marketCapUSD": 6.356734858182233e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-06-13",
@@ -19901,7 +19901,7 @@
       "rateETH": "831051260526030",
       "rateUSD": "1000000000000000000",
       "yield": "11896175921588614586595",
-      "marketCapUSD": 6.4563566831065095e+25
+      "marketCapUSD": 6.4563566831065095e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-07-08",
@@ -19926,7 +19926,7 @@
       "rateETH": "818572917811627",
       "rateUSD": "1000000000000000000",
       "yield": "1922168281166367410238",
-      "marketCapUSD": 6.673787340296279e+25
+      "marketCapUSD": 6.673787340296279e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-08-02",
@@ -19951,7 +19951,7 @@
       "rateETH": "612167885217819",
       "rateUSD": "1000000000000000000",
       "yield": "1194475188599113079063",
-      "marketCapUSD": 4.97902498526974e+25
+      "marketCapUSD": 4.97902498526974e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-08-27",
@@ -19976,7 +19976,7 @@
       "rateETH": "669145506689872",
       "rateUSD": "1000000000000000000",
       "yield": "1278076257194130613264",
-      "marketCapUSD": 4.85429912430896e+25
+      "marketCapUSD": 4.85429912430896e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-09-21",
@@ -20001,7 +20001,7 @@
       "rateETH": "798890947630860",
       "rateUSD": "1000000000000000000",
       "yield": "995358342829845782912",
-      "marketCapUSD": 4.193196228413429e+25
+      "marketCapUSD": 4.193196228413429e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-10-16",
@@ -20026,7 +20026,7 @@
       "rateETH": "764824205156444",
       "rateUSD": "1000000000000000000",
       "yield": "1693433715995873523532",
-      "marketCapUSD": 4.092556235600834e+25
+      "marketCapUSD": 4.092556235600834e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-11-10",
@@ -20051,7 +20051,7 @@
       "rateETH": "770042275320915",
       "rateUSD": "1000000000000000000",
       "yield": "36352361687895607874096",
-      "marketCapUSD": 4.916656296857119e+25
+      "marketCapUSD": 4.916656296857119e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-12-05",
@@ -20076,7 +20076,7 @@
       "rateETH": "794571487596739",
       "rateUSD": "1000000000000000000",
       "yield": "2135694844587076853830",
-      "marketCapUSD": 5.2410546820763336e+25
+      "marketCapUSD": 5.2410546820763336e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2022-12-30",
@@ -20101,7 +20101,7 @@
       "rateETH": "834405574451663",
       "rateUSD": "1000000000000000000",
       "yield": "2962965704963591279710",
-      "marketCapUSD": 4.906105707379443e+25
+      "marketCapUSD": 4.906105707379443e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-01-24",
@@ -20126,7 +20126,7 @@
       "rateETH": "643297801851411",
       "rateUSD": "1000000000000000000",
       "yield": "2286735116327706274505",
-      "marketCapUSD": 5.165654176092307e+25
+      "marketCapUSD": 5.165654176092307e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-02-18",
@@ -20151,7 +20151,7 @@
       "rateETH": "590438456173011",
       "rateUSD": "1000000000000000000",
       "yield": "2595851235785947282785",
-      "marketCapUSD": 5.2442604635325375e+25
+      "marketCapUSD": 5.2442604635325375e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-03-15",
@@ -20176,7 +20176,7 @@
       "rateETH": "604624115327138",
       "rateUSD": "1000000000000000000",
       "yield": "5249840051619359508637",
-      "marketCapUSD": 3.0801771517035694e+25
+      "marketCapUSD": 3.0801771517035694e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-04-09",
@@ -20201,7 +20201,7 @@
       "rateETH": "537836820308718",
       "rateUSD": "1000000000000000000",
       "yield": "2367116828240608692436",
-      "marketCapUSD": 3.4906686412343322e+25
+      "marketCapUSD": 3.4906686412343322e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-05-04",
@@ -20226,7 +20226,7 @@
       "rateETH": "532694884451173",
       "rateUSD": "1000000000000000000",
       "yield": "2981840078091295206630",
-      "marketCapUSD": 3.876430162915627e+25
+      "marketCapUSD": 3.876430162915627e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-05-29",
@@ -20251,7 +20251,7 @@
       "rateETH": "528178312998468",
       "rateUSD": "1000000000000000000",
       "yield": "4734746829760316132317",
-      "marketCapUSD": 2.7364550914304928e+25
+      "marketCapUSD": 2.7364550914304928e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-06-23",
@@ -20276,7 +20276,7 @@
       "rateETH": "528801154901722",
       "rateUSD": "1000000000000000000",
       "yield": "0",
-      "marketCapUSD": 2.1725929192976075e+25
+      "marketCapUSD": 2.1725929192976075e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-07-18",
@@ -20301,7 +20301,7 @@
       "rateETH": "527016421252990",
       "rateUSD": "1000000000000000000",
       "yield": "1416208916519840152676",
-      "marketCapUSD": 2.2632613848615314e+25
+      "marketCapUSD": 2.2632613848615314e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-08-12",
@@ -20326,7 +20326,7 @@
       "rateETH": "540841657787849",
       "rateUSD": "1000000000000000000",
       "yield": "4854109860671085681425",
-      "marketCapUSD": 1.9034553268864783e+25
+      "marketCapUSD": 1.9034553268864783e25
     },
     {
       "id": "1-0x2a8e1e676ec238d8a992307b495b45b3feaa5e86-2023-09-06",
@@ -20351,7 +20351,7 @@
       "rateETH": "611718833851729",
       "rateUSD": "998787310000000000",
       "yield": "1296402066759509267180",
-      "marketCapUSD": 1.591863873855942e+25
+      "marketCapUSD": 1.591863873855942e25
     }
   ],
   "superoethb_oTokens": [
@@ -23087,7 +23087,7 @@
       "rateETH": "1000019866263652272",
       "rateUSD": "2221954600000000000000",
       "yield": "154962588709793815",
-      "marketCapUSD": 7.244255400065197e+24
+      "marketCapUSD": 7.244255400065197e24
     },
     {
       "id": "8453-0xdbfefd2e8460a6ee4955a68582f85708baea60a3-2024-10-01",
@@ -23112,7 +23112,7 @@
       "rateETH": "1000014710692044086",
       "rateUSD": "2448906326810000000000",
       "yield": "5771660247467213490",
-      "marketCapUSD": 3.336358904614882e+26
+      "marketCapUSD": 3.336358904614882e26
     },
     {
       "id": "8453-0xdbfefd2e8460a6ee4955a68582f85708baea60a3-2024-10-26",
@@ -23137,7 +23137,7 @@
       "rateETH": "1000018731652402784",
       "rateUSD": "2481330626980000000000",
       "yield": "10497417276891908207",
-      "marketCapUSD": 4.6181529537608754e+26
+      "marketCapUSD": 4.6181529537608754e26
     },
     {
       "id": "8453-0xdbfefd2e8460a6ee4955a68582f85708baea60a3-2024-11-20",
@@ -23162,7 +23162,7 @@
       "rateETH": "1000017689355759479",
       "rateUSD": "3070985023000000000000",
       "yield": "8945796632375630637",
-      "marketCapUSD": 5.0940151767491386e+26
+      "marketCapUSD": 5.0940151767491386e26
     },
     {
       "id": "8453-0xdbfefd2e8460a6ee4955a68582f85708baea60a3-2024-12-15",
@@ -23187,7 +23187,7 @@
       "rateETH": "1000012013902139498",
       "rateUSD": "3954781500000000000000",
       "yield": "8145965732250199541",
-      "marketCapUSD": 6.50969982681111e+26
+      "marketCapUSD": 6.50969982681111e26
     }
   ],
   "ogn_erc20Balances": [
@@ -24288,7 +24288,7 @@
     },
     {
       "id": "8453-19050774-0xdbfefd2e8460a6ee4955a68582f85708baea60a3-0x6cb442acf35158d5eda88fe602221b67b400be3e",
-      "timestamp": "2024-08-29T00:37:55.000000Z",
+      "timestamp": "2024-08-29T01:28:21.000Z",
       "blockNumber": 19050774,
       "chainId": 8453,
       "address": "0xdbfefd2e8460a6ee4955a68582f85708baea60a3",
@@ -26189,4 +26189,4 @@
       "transactionFee": "2331424208255608"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/validation/validate.ts b/src/validation/validate.ts
index 01030fbf..a529dbd0 100644
--- a/src/validation/validate.ts
+++ b/src/validation/validate.ts
@@ -75,7 +75,16 @@ const validateExpectation = async <
   Class: EntityClass<any>,
   expectation: T,
 ) => {
-  const actual = await ctx.store.get(Class, expectation.id)
+  const relations = Object.keys(expectation)
+    .filter((key) => typeof expectation[key as keyof typeof expectation] === 'object')
+    .reduce(
+      (acc, key) => {
+        acc[key] = true
+        return acc
+      },
+      {} as Record<string, boolean>,
+    )
+  const actual = await ctx.store.findOne(Class, { where: { id: expectation.id }, relations })
   assert(
     actual,
     `Expected entity does not exist: block=${block.header.height} Entity=${Class.name} id=${expectation.id}`,