diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts
index c13f3130..45d5a361 100644
--- a/test/integration/ComputeFlow.test.ts
+++ b/test/integration/ComputeFlow.test.ts
@@ -13,6 +13,7 @@ import { homedir } from 'os'
 import fs from 'fs'
 import { downloadFile, crossFetchGeneric } from '../../src/utils/FetchHelper'
 import console from 'console'
+import { ProviderFees } from '../../src/@types'
 
 const data = JSON.parse(
   fs.readFileSync(
@@ -258,19 +259,24 @@ describe('Simple compute tests', async () => {
       providerUrl,
       crossFetchGeneric
     )
+    const providerAlgoFees: ProviderFees = {
+      providerFeeAddress: initializeDataAlgo.providerFee.providerFeeAddress,
+      providerFeeToken: initializeDataAlgo.providerFee.providerFeeToken,
+      providerFeeAmount: initializeDataAlgo.providerFee.providerFeeAmount,
+      v: initializeDataAlgo.providerFee.v,
+      r: initializeDataAlgo.providerFee.r,
+      s: initializeDataAlgo.providerFee.s,
+      providerData: initializeDataAlgo.providerFee.providerData,
+      validUntil: initializeDataAlgo.providerFee.validUntil
+    }
+
     // make the payment
     const txidAlgo = await datatoken.startOrder(
       datatokenAddressAlgo,
       consumerAccount,
       initializeDataAlgo.computeAddress,
       0,
-      initializeDataAlgo.providerFee.providerFeeAddress,
-      initializeDataAlgo.providerFee.providerFeeToken,
-      initializeDataAlgo.providerFee.providerFeeAmount,
-      initializeDataAlgo.providerFee.v,
-      initializeDataAlgo.providerFee.r,
-      initializeDataAlgo.providerFee.s,
-      initializeDataAlgo.providerFee.providerData
+      providerAlgoFees
     )
     assert(txidAlgo, 'Failed to order algo')
     // initialize provider orders for asset
@@ -284,19 +290,23 @@ describe('Simple compute tests', async () => {
       null,
       'env1'
     )
+    const providerDatasetFees: ProviderFees = {
+      providerFeeAddress: initializeData.providerFee.providerFeeAddress,
+      providerFeeToken: initializeData.providerFee.providerFeeToken,
+      providerFeeAmount: initializeData.providerFee.providerFeeAmount,
+      v: initializeData.providerFee.v,
+      r: initializeData.providerFee.r,
+      s: initializeData.providerFee.s,
+      providerData: initializeData.providerFee.providerData,
+      validUntil: initializeData.providerFee.validUntil
+    }
     // make the payment
     const txidAsset = await datatoken.startOrder(
       datatokenAddressAsset,
       consumerAccount,
       initializeDataAlgo.computeAddress,
       0,
-      initializeData.providerFee.providerFeeAddress,
-      initializeData.providerFee.providerFeeToken,
-      initializeData.providerFee.providerFeeAmount,
-      initializeData.providerFee.v,
-      initializeData.providerFee.r,
-      initializeData.providerFee.s,
-      initializeData.providerFee.providerData
+      providerDatasetFees
     )
     assert(txidAsset, 'Failed to order algo')
     // start the compute job
diff --git a/test/integration/SimplePublishConsumeFlow.test.ts b/test/integration/SimplePublishConsumeFlow.test.ts
index 43512f8b..deb5e66f 100644
--- a/test/integration/SimplePublishConsumeFlow.test.ts
+++ b/test/integration/SimplePublishConsumeFlow.test.ts
@@ -12,6 +12,7 @@ import { homedir } from 'os'
 import fs from 'fs'
 import { downloadFile, crossFetchGeneric } from '../../src/utils/FetchHelper'
 import console from 'console'
+import { ProviderFees } from '../../src/@types/Provider'
 
 const data = JSON.parse(
   fs.readFileSync(
@@ -135,19 +136,23 @@ describe('Simple Publish & consume test', async () => {
       providerUrl,
       crossFetchGeneric
     )
+    const providerFees: ProviderFees = {
+      providerFeeAddress: initializeData.providerFee.providerFeeAddress,
+      providerFeeToken: initializeData.providerFee.providerFeeToken,
+      providerFeeAmount: initializeData.providerFee.providerFeeAmount,
+      v: initializeData.providerFee.v,
+      r: initializeData.providerFee.r,
+      s: initializeData.providerFee.s,
+      providerData: initializeData.providerFee.providerData,
+      validUntil: initializeData.providerFee.validUntil
+    }
     // make the payment
     const txid = await datatoken.startOrder(
       datatokenAddress,
       consumerAccount,
       consumerAccount,
       0,
-      initializeData.providerFee.providerFeeAddress,
-      initializeData.providerFee.providerFeeToken,
-      initializeData.providerFee.providerFeeAmount,
-      initializeData.providerFee.v,
-      initializeData.providerFee.r,
-      initializeData.providerFee.s,
-      initializeData.providerFee.providerData
+      providerFees
     )
     // get the url
     const downloadURL = await ProviderInstance.getDownloadUrl(