diff --git a/integration/ocean/ConsumeAsset.test.ts b/integration/ocean/ConsumeAsset.test.ts
index 8f5ad5b..c5a0d78 100644
--- a/integration/ocean/ConsumeAsset.test.ts
+++ b/integration/ocean/ConsumeAsset.test.ts
@@ -113,7 +113,7 @@ describe("Consume Asset", () => {
         assert.isTrue(paid, "The asset has not been paid correctly")
     })
 
-    xit("should lock the payment", async () => {
+    xit("should grant the access", async () => {
         const granted = await ocean.agreements.conditions
             .grantAccess(serviceAgreementSignatureResult.agreementId, ddo.id, consumer.getId(), publisher)
 
diff --git a/integration/ocean/RegisterEscrowAccessSecretStoreTemplate.test.ts b/integration/ocean/RegisterEscrowAccessSecretStoreTemplate.test.ts
index 21bde74..177b233 100644
--- a/integration/ocean/RegisterEscrowAccessSecretStoreTemplate.test.ts
+++ b/integration/ocean/RegisterEscrowAccessSecretStoreTemplate.test.ts
@@ -74,8 +74,8 @@ describe("Register Escrow Access Secret Store Template", () => {
             conditionIdEscrow = await escrowReward.generateIdHash(
                 agreementId,
                 escrowAmount,
-                consumer.getId(),
                 publisher.getId(),
+                consumer.getId(),
                 conditionIdLock,
                 conditionIdAccess,
             )
@@ -147,8 +147,8 @@ describe("Register Escrow Access Secret Store Template", () => {
             const fulfill = await escrowReward.fulfill(
                 agreementId,
                 escrowAmount,
-                consumer.getId(),
                 publisher.getId(),
+                consumer.getId(),
                 conditionIdLock,
                 conditionIdAccess,
                 consumer.getId(),
diff --git a/integration/ocean/Signature.test.ts b/integration/ocean/Signature.test.ts
index 1d0be70..89229fc 100644
--- a/integration/ocean/Signature.test.ts
+++ b/integration/ocean/Signature.test.ts
@@ -89,7 +89,7 @@ describe("Signature", () => {
         assert.equal(
             signature,
             // tslint:disable-next-line
-            "0x842c61796f8dab8dc18ff7499a98054fcaeaddfd2384dbf7d545f00e8d44bb391a1dea96a4df692d9b9f141239024b9112cb1c815f9c4063d3a79ccf450abf3e1b",
+            "0x2164dd54b1df9908b3aa31a2d195c3e3a244ff62b51b0403958234f50cb313615ac5ca6660f7a76957612deeca84e6953f2ce74f56def351d9eb0f155a4eddff1c",
             "The signatuere is not correct.",
         )
     })
diff --git a/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts b/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts
index a9cbb91..a599ce8 100644
--- a/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts
+++ b/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts
@@ -105,8 +105,8 @@ export class EscrowAccessSecretStoreTemplate extends AgreementTemplate {
         const escrowRewardId = await escrowReward.generateIdHash(
             agreementId,
             amount,
-            from,
             publisher,
+            from,
             lockRewardConditionId,
             accessSecretStoreConditionId,
         )
diff --git a/src/ocean/OceanAgreementsConditions.ts b/src/ocean/OceanAgreementsConditions.ts
index 7f9a702..416a56d 100644
--- a/src/ocean/OceanAgreementsConditions.ts
+++ b/src/ocean/OceanAgreementsConditions.ts
@@ -87,8 +87,8 @@ export default class OceanAgreementsConditions {
         const receipt = await escrowReward.fulfill(
             agreementId,
             amount,
-            consumer,
             publisher,
+            consumer,
             conditionIdLock,
             conditionIdAccess,
             from.getId(),