diff --git a/package.json b/package.json
index b139be40..e17bd525 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "test:fixed": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/fixedRate/FixedRateExchange.test.ts'",
     "test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/balancer/Pool.test.ts'",
     "test:dispenser": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/dispenser/Dispenser.test.ts'",
-    "test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Datatoken.test.ts'",
+    "test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/tokens/Datatoken.test.ts'",
     "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Nft.test.ts'",
     "test:factory": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NftFactory.test.ts'",
     "test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'",
diff --git a/test/unit/NftFactory.test.ts b/test/unit/NftFactory.test.ts
index 6c5fd8e4..a1259db3 100644
--- a/test/unit/NftFactory.test.ts
+++ b/test/unit/NftFactory.test.ts
@@ -394,7 +394,7 @@ describe('Nft Factory test', () => {
       message,
       '7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6'
     )
-    console.log('signedMessage', signedMessage)
+
     const orders: TokenOrder[] = [
       {
         tokenAddress: dtAddress,
@@ -404,8 +404,8 @@ describe('Nft Factory test', () => {
         providerFeeToken: consumeFeeToken,
         providerFeeAmount: consumeFeeAmount,
         v: signedMessage.v,
-        r: signedMessage.r.toString(),
-        s: signedMessage.s.toString(),
+        r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+        s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
         providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData))
       },
       {
@@ -416,12 +416,12 @@ describe('Nft Factory test', () => {
         providerFeeToken: consumeFeeToken,
         providerFeeAmount: consumeFeeAmount,
         v: signedMessage.v,
-        r: signedMessage.r.toString(),
-        s: signedMessage.s.toString(),
+        r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+        s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
         providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData))
       }
     ]
-
+    console.log('orders', orders)
     await nftFactory.startMultipleTokenOrder(user2, orders)
 
     // we check user2 has no more DTs
diff --git a/test/unit/tokens/Datatoken.test.ts b/test/unit/tokens/Datatoken.test.ts
index 58b238f5..25c09abc 100644
--- a/test/unit/tokens/Datatoken.test.ts
+++ b/test/unit/tokens/Datatoken.test.ts
@@ -370,8 +370,8 @@ describe('Datatoken', () => {
       '0x0000000000000000000000000000000000000000',
       '0',
       signedMessage.v,
-      signedMessage.r.toString(),
-      signedMessage.s.toString(),
+      web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+      web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
       web3.utils.toHex(web3.utils.asciiToHex(providerData))
     )
     assert(order !== null)
@@ -409,8 +409,8 @@ describe('Datatoken', () => {
       providerFeeToken: '0x0000000000000000000000000000000000000000',
       providerFeeAmount: '0',
       v: signedMessage.v,
-      r: signedMessage.r.toString(),
-      s: signedMessage.s.toString(),
+      r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+      s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
       providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData))
     }
 
@@ -443,8 +443,8 @@ describe('Datatoken', () => {
       providerFeeToken: '0x0000000000000000000000000000000000000000',
       providerFeeAmount: '0',
       v: signedMessage.v,
-      r: signedMessage.r.toString(),
-      s: signedMessage.s.toString(),
+      r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+      s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
       providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData))
     }