diff --git a/scripts/admin-test-env-modules/finance-full-fixtures.mjs b/scripts/admin-test-env-modules/finance-full-fixtures.mjs
index ab7667f57..59a36304b 100644
--- a/scripts/admin-test-env-modules/finance-full-fixtures.mjs
+++ b/scripts/admin-test-env-modules/finance-full-fixtures.mjs
@@ -399,7 +399,8 @@ export async function run(context) {
   context.createdResources.financeFullFixtures = {
     marker: context.marker, customerId,
     orders: measured.map((item) => ({ orderId: id(item.orderId), orderNo: item.orderNo || null,
-      waybillId: item.waybillId ? id(item.waybillId) : null, inboundId: id(item.inboundId),
+      shipmentId: item.shipmentId ? id(item.shipmentId) : null,
+      waybillId: item.waybillId ? id(item.waybillId) : (item.shipmentId ? id(item.shipmentId) : null), inboundId: id(item.inboundId),
       actualWeightKg: item.actualWeightKg, totalVolumeCbm: item.totalVolumeCbm,
       businessDate: fixtures.find((fee) => fee.orderId === id(item.orderId))?.businessDate || null })),
     feeSources: fixtures,
diff --git a/scripts/admin-test-env-modules/finance-reconciliation-full.mjs b/scripts/admin-test-env-modules/finance-reconciliation-full.mjs
index 1a8a18245..45ba9d1e6 100644
--- a/scripts/admin-test-env-modules/finance-reconciliation-full.mjs
+++ b/scripts/admin-test-env-modules/finance-reconciliation-full.mjs
@@ -19,7 +19,7 @@ function statementId(value) { return id(value?.statementId ?? value?.id ?? value
 function settlementId(value) { return id(value?.settlementId ?? value?.id) }
 function sourceId(value) { return id(value?.feeSourceId ?? value?.financeFeeSourceId ?? value?.id) }
 function sourceDate(value) { return value?.businessDate ?? value?.billingDate ?? value?.feeDate ?? '' }
-function sourceWaybill(value) { return id(value?.waybillId ?? value?.shipmentId ?? value?.orderId ?? value?.inboundId ?? value?.sourceNo) }
+function sourceWaybill(value) { return id(value?.waybillId ?? value?.shipmentId ?? value?.orderNo ?? value?.sourceNo) }
 function financePoolId(value) {
   const poolItemId = id(value?.poolItemId)
   if (poolItemId) return poolItemId.includes(':') ? poolItemId.slice(poolItemId.indexOf(':') + 1) : poolItemId
@@ -81,7 +81,8 @@ async function normalizeFixture(context) {
   const orders = new Map(root.orders.map((order) => [id(order.orderId ?? order.id), order]))
   const poolResponse = await context.request('GET',
     `${BASE}/fee-pool?customerId=${encodeURIComponent(customerId)}&direction=ALL`)
-  const pool = rows(poolResponse?.body?.data).filter((item) => String(item?.sourceType ?? '') !== 'MANUAL_COST')
+  const poolData = poolResponse?.body?.data
+  const pool = rows(poolData).concat(rows(poolData?.items)).filter((item) => String(item?.sourceType ?? '') !== 'MANUAL_COST')
   const poolBySource = new Map(pool.map((item) => [id(item?.sourceId), item]))
   const attemptedSources = root.feeSources.map((raw) => {
     const order = orders.get(id(raw.orderId))