diff --git a/src/test/mappingHandlers.test.ts b/src/test/mappingHandlers.test.ts
index c0697a51..971be57f 100644
--- a/src/test/mappingHandlers.test.ts
+++ b/src/test/mappingHandlers.test.ts
@@ -1,12 +1,22 @@
 /** @file test against agoric-3-proposals:latest */
 import { subqlTest } from '@subql/testing';
-import { StateChangeEvent, Wallet } from '../types';
+import {
+  ReserveAllocationMetrics,
+  ReserveAllocationMetricsDaily,
+  ReserveMetrics,
+  StateChangeEvent,
+  Vault,
+  VaultManagerGovernance,
+  VaultManagerMetrics,
+  VaultManagerMetricsDaily,
+  VaultStatesDaily,
+  Wallet,
+} from '../types';
 
 // FIXME observed in A3P:latest but not passing tests
 subqlTest(
   'StateChangeEvent in state_change at block 627',
-  627, // block height to process
-  // dependent entities
+  627,
   [],
   [
     new Wallet(
@@ -29,3 +39,145 @@ subqlTest(
 
   'handleStateChangeEvent',
 );
+
+const vault = new Vault(
+  'published.vaultFactory.managers.manager0.vaults.vault6',
+  BigInt(742),
+  new Date('2024-12-09 23:13:19.186'),
+  'published.wallet.agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q.current',
+);
+
+vault.balance = BigInt(788000000);
+vault.lockedValue = BigInt(788000000);
+vault.coin = 'ATOM';
+vault.denom = 'ATOM';
+vault.debt = BigInt(4745610000);
+vault.state = 'active';
+
+subqlTest(
+  'Vault and VaultStateDailies at height 742',
+  742,
+  [],
+  [
+    vault,
+    new VaultStatesDaily(
+      '20241209',
+      BigInt(742),
+      new Date('2024-12-09 23:13:19.186'),
+      BigInt(1),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+    ),
+  ],
+
+  'handleStateChangeEvent',
+);
+
+const reserveAllocationMetricsDaily = new ReserveAllocationMetricsDaily(
+  'IST:20241216',
+  'IST',
+  20241216,
+  BigInt(1212),
+  new Date('2024-12-16T11:42:27.000Z'),
+);
+
+reserveAllocationMetricsDaily.denom = 'IST';
+reserveAllocationMetricsDaily.key = 'Fee';
+reserveAllocationMetricsDaily.valueLast = BigInt(184980868);
+reserveAllocationMetricsDaily.metricsCount = BigInt(1);
+
+const vaultManagerMetricsDaily = new VaultManagerMetricsDaily(
+  'published.vaultFactory.managers.manager1.metrics:20241216',
+  'published.vaultFactory.managers.manager1.metrics',
+  20241216,
+  BigInt(1212),
+  new Date('2024-12-16 11:42:27.202'),
+);
+
+vaultManagerMetricsDaily.liquidatingCollateralBrand = 'stATOM';
+vaultManagerMetricsDaily.liquidatingDebtBrand = 'IST';
+vaultManagerMetricsDaily.liquidatingCollateralValueLast = BigInt(0);
+vaultManagerMetricsDaily.liquidatingDebtValueLast = BigInt(0);
+vaultManagerMetricsDaily.lockedQuoteDenominatorLast = BigInt(0);
+vaultManagerMetricsDaily.lockedQuoteNumeratorLast = BigInt(0);
+vaultManagerMetricsDaily.numActiveVaultsLast = BigInt(0);
+vaultManagerMetricsDaily.numLiquidatingVaultsLast = BigInt(0);
+vaultManagerMetricsDaily.numLiquidationsAbortedLast = BigInt(0);
+vaultManagerMetricsDaily.numLiquidationsCompletedLast = BigInt(0);
+vaultManagerMetricsDaily.retainedCollateralLast = BigInt(0);
+vaultManagerMetricsDaily.totalCollateralLast = BigInt(0);
+vaultManagerMetricsDaily.totalCollateralSoldLast = BigInt(0);
+vaultManagerMetricsDaily.totalDebtLast = BigInt(0);
+vaultManagerMetricsDaily.totalOverageReceivedLast = BigInt(0);
+vaultManagerMetricsDaily.totalProceedsReceivedLast = BigInt(0);
+vaultManagerMetricsDaily.totalShortfallReceivedLast = BigInt(0);
+vaultManagerMetricsDaily.metricsCount = BigInt(1);
+
+subqlTest(
+  'VaultManagerGovernance, VaultManagerMetrics, VaultManagerMetricsDaily, ReserveMetrics, \
+  ReserveAllocationMetrics, and ReserveAllocationMetricsDaily at block height 1212',
+  1212,
+  [],
+  [
+    new VaultManagerGovernance(
+      'published.vaultFactory.managers.manager1.governance',
+      BigInt(1212),
+      new Date('2024-12-16 11:42:27.202'),
+      BigInt(1000000000),
+      BigInt(100),
+      BigInt(1),
+      BigInt(100),
+      BigInt(150),
+      BigInt(100),
+      BigInt(25),
+      BigInt(100),
+      BigInt(1),
+      BigInt(10000),
+      BigInt(50),
+    ),
+    new VaultManagerMetrics(
+      'published.vaultFactory.managers.manager1.metrics',
+      BigInt(1212),
+      new Date('2024-12-16 11:42:27.202'),
+      'stATOM',
+      BigInt(0),
+      'IST',
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+    ),
+    vaultManagerMetricsDaily,
+    new ReserveMetrics(
+      'published.reserve.metrics',
+      BigInt(1212),
+      new Date('2024-12-16T11:42:27.202Z'),
+      BigInt(0),
+      BigInt(0),
+      BigInt(0),
+    ),
+    new ReserveAllocationMetrics(
+      'IST',
+      BigInt(1212),
+      new Date('2024-12-16T11:42:27.202Z'),
+      'IST',
+      'Fee',
+      BigInt(184980868),
+      'published.reserve.metrics',
+    ),
+    reserveAllocationMetricsDaily,
+  ],
+  'handleStateChangeEvent',
+);