diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts
index 3ae5e799..a412dbda 100644
--- a/test/integration/ComputeFlow.test.ts
+++ b/test/integration/ComputeFlow.test.ts
@@ -81,10 +81,10 @@ describe('Compute flow', () => {
       )
       tokenAddress = await datatoken.create(
         blob,
-        'AliceDT',
-        'DTA',
+        alice.getId(),
         '10000000000',
-        alice.getId()
+        'AliceDT',
+        'DTA'
       )
       assert(tokenAddress != null)
     })
diff --git a/test/integration/Marketplaceflow.test.ts b/test/integration/Marketplaceflow.test.ts
index 480f6ece..a88bf697 100644
--- a/test/integration/Marketplaceflow.test.ts
+++ b/test/integration/Marketplaceflow.test.ts
@@ -59,10 +59,10 @@ describe('Marketplace flow', () => {
       )
       tokenAddress = await datatoken.create(
         blob,
-        'AliceDT',
-        'DTA',
+        alice.getId(),
         '10000000000',
-        alice.getId()
+        'AliceDT',
+        'DTA'
       )
       assert(tokenAddress != null)
     })
diff --git a/test/integration/Simpleflow.test.ts b/test/integration/Simpleflow.test.ts
index bddfacc5..427a76a8 100644
--- a/test/integration/Simpleflow.test.ts
+++ b/test/integration/Simpleflow.test.ts
@@ -41,7 +41,7 @@ describe('Simple flow', () => {
         datatokensTemplate.abi as AbiItem[],
         web3
       )
-      tokenAddress = await datatoken.create(blob, 'AliceDT', 'DTA', '10000000000', alice)
+      tokenAddress = await datatoken.create(blob, alice, '10000000000', 'AliceDT', 'DTA')
     })
     it('Alice mints 100 tokens', async () => {
       await datatoken.mint(tokenAddress, alice, tokenAmount)
diff --git a/test/unit/exchanges/FixedPriceExchange.test.ts b/test/unit/exchanges/FixedPriceExchange.test.ts
index 95011b03..0bfbe434 100644
--- a/test/unit/exchanges/FixedPriceExchange.test.ts
+++ b/test/unit/exchanges/FixedPriceExchange.test.ts
@@ -81,10 +81,10 @@ describe('FixedRateExchange flow', () => {
     it('should create datatokens smart contract', async () => {
       tokenAddress = await datatoken.create(
         blob,
-        'AliceDT',
-        'DTA',
+        alice,
         web3.utils.toWei('1000000000000000'),
-        alice
+        'AliceDT',
+        'DTA'
       )
       assert(tokenAddress !== null)
       if (consoleDebug) console.log("Alice's address:" + alice)
@@ -100,10 +100,10 @@ describe('FixedRateExchange flow', () => {
       )
       oceanTokenAddress = await oceandatatoken.create(
         blob,
-        'BobDT',
-        'DTB',
+        bob,
         web3.utils.toWei('1000000000000000'),
-        bob
+        'BobDT',
+        'DTB'
       )
       if (consoleDebug) console.log("Bob's address:" + bob)
       if (consoleDebug) console.log('oceanTokenAddress:' + oceanTokenAddress)