diff --git a/test/smttestvectors.js b/test/smttestvectors.js
index 1819bc4..31f4264 100644
--- a/test/smttestvectors.js
+++ b/test/smttestvectors.js
@@ -4,22 +4,13 @@ const snarkjs = require("snarkjs");
 const smt = require("../src/smt.js");
 const mimcjs = require("../src/mimc7.js");
 
-const assert = chai.assert;
 const expect = chai.expect;
 
 const bigInt = snarkjs.bigInt;
 
-const bytesToHex = function (buff) {
+function bytesToHex(buff) {
     return `0x${buff.toString("hex")}`;
-};
-
-const hexToBytes = function (hex) {
-    if (hex.substr(0, 2) === "0x") {
-        return Buffer.from(hex.substr(2), "hex");
-    }
-
-    return Buffer.from(hex, "hex");
-};
+}
 
 function bigIntToBuffer(number) {
     const buff = Buffer.alloc(32);
@@ -32,22 +23,6 @@ function bigIntToBuffer(number) {
     return buff;
 }
 
-function stringifyBigInts(o) {
-    if ((typeof(o) == "bigint") || (o instanceof bigInt))  {
-        return o.toString(10);
-    } else if (Array.isArray(o)) {
-        return o.map(stringifyBigInts);
-    } else if (typeof o == "object") {
-        const res = {};
-        for (let k in o) {
-            res[k] = stringifyBigInts(o[k]);
-        }
-        return res;
-    } else {
-        return o;
-    }
-}
-
 function newEntry(arr) {
     return {
         hi: mimcjs.multiHash(arr.slice(2)),
@@ -55,14 +30,6 @@ function newEntry(arr) {
     };
 }
 
-function smtHash(arr) {
-    let r = bigInt(0);
-    for (let i=0; i<arr.length; i++) {
-        r = mimcjs.hash(r, bigInt(arr[i]), 91 );
-    }
-    return r;
-}
-
 describe("[sparse-merkle-tree] Javascript test", function () {
   
     this.timeout(100000);
@@ -111,161 +78,77 @@ describe("[sparse-merkle-tree] Javascript test", function () {
         expect(bytesToHex(rootBuff)).to.be.equal("0x1fb755a3677f8fd6c47b5462b69778ef6383c31d2d498b765e953f8cacaa6744");
     });
 
-});
-
-// describe("SMT Javascript test", function () {
-//   this.timeout(100000);
-//   before( async () => {
-//   });
-
-//   it("Should insert 2 elements and empty them", async () => {
-//       const tree = await smt.newMemEmptyTrie();
-//       const key1 = bigInt(111);
-//       const value1 = bigInt(222);
-//       const key2 = bigInt(333);
-//       const value2 = bigInt(444);
-
-//       await tree.insert(key1,value1);
-//       await tree.insert(key2,value2);
-//       await tree.delete(key2);
-//       await tree.delete(key1);
-
-//       assert(tree.root.isZero());
-//   });
-
-//   it("Should insert 3 elements in dferent order and should be the same", async () => {
-//       const keys = [bigInt(8), bigInt(9), bigInt(32)];
-//       const values = [bigInt(88), bigInt(99), bigInt(3232)];
-//       const tree1 = await smt.newMemEmptyTrie();
-//       const tree2 = await smt.newMemEmptyTrie();
-//       const tree3 = await smt.newMemEmptyTrie();
-//       const tree4 = await smt.newMemEmptyTrie();
-//       const tree5 = await smt.newMemEmptyTrie();
-//       const tree6 = await smt.newMemEmptyTrie();
-
-//       await tree1.insert(keys[0],values[0]);
-//       await tree1.insert(keys[1],values[1]);
-//       await tree1.insert(keys[2],values[2]);
-
-//       await tree2.insert(keys[0],values[0]);
-//       await tree2.insert(keys[2],values[2]);
-//       await tree2.insert(keys[1],values[1]);
-
-//       await tree3.insert(keys[1],values[1]);
-//       await tree3.insert(keys[0],values[0]);
-//       await tree3.insert(keys[2],values[2]);
-
-//       await tree4.insert(keys[1],values[1]);
-//       await tree4.insert(keys[2],values[2]);
-//       await tree4.insert(keys[0],values[0]);
-
-//       await tree5.insert(keys[2],values[2]);
-//       await tree5.insert(keys[0],values[0]);
-//       await tree5.insert(keys[1],values[1]);
-
-//       await tree6.insert(keys[2],values[2]);
-//       await tree6.insert(keys[1],values[1]);
-//       await tree6.insert(keys[0],values[0]);
-
-//       assert(tree1.root.equals(tree2.root));
-//       assert(tree2.root.equals(tree3.root));
-//       assert(tree3.root.equals(tree4.root));
-//       assert(tree4.root.equals(tree5.root));
-//       assert(tree5.root.equals(tree6.root));
-
-//       assert.equal(Object.keys(tree1.db.nodes).length,  Object.keys(tree2.db.nodes).length);
-//       assert.equal(Object.keys(tree2.db.nodes).length,  Object.keys(tree3.db.nodes).length);
-//       assert.equal(Object.keys(tree3.db.nodes).length,  Object.keys(tree4.db.nodes).length);
-//       assert.equal(Object.keys(tree4.db.nodes).length,  Object.keys(tree5.db.nodes).length);
-//       assert.equal(Object.keys(tree5.db.nodes).length,  Object.keys(tree6.db.nodes).length);
-
-//       await tree1.delete(keys[0]);
-//       await tree1.delete(keys[1]);
-//       await tree2.delete(keys[1]);
-//       await tree2.delete(keys[0]);
-//       assert(tree1.root.equals(tree2.root));
-
-//       await tree3.delete(keys[0]);
-//       await tree3.delete(keys[2]);
-//       await tree4.delete(keys[2]);
-//       await tree4.delete(keys[0]);
-//       assert(tree3.root.equals(tree4.root));
-
-//       await tree5.delete(keys[1]);
-//       await tree5.delete(keys[2]);
-//       await tree6.delete(keys[2]);
-//       await tree6.delete(keys[1]);
-//       assert(tree5.root.equals(tree6.root));
-
-//       await tree1.delete(keys[2]);
-//       await tree2.delete(keys[2]);
-//       await tree3.delete(keys[1]);
-//       await tree4.delete(keys[1]);
-//       await tree5.delete(keys[0]);
-//       await tree6.delete(keys[0]);
-
-//       assert(tree1.root.isZero());
-//       assert(tree2.root.isZero());
-//       assert(tree3.root.isZero());
-//       assert(tree4.root.isZero());
-//       assert(tree5.root.isZero());
-//       assert(tree6.root.isZero());
-
-//       assert.equal(Object.keys(tree1.db.nodes).length, 0);
-//       assert.equal(Object.keys(tree2.db.nodes).length, 0);
-//       assert.equal(Object.keys(tree3.db.nodes).length, 0);
-//       assert.equal(Object.keys(tree4.db.nodes).length, 0);
-//       assert.equal(Object.keys(tree5.db.nodes).length, 0);
-//       assert.equal(Object.keys(tree6.db.nodes).length, 0);
-//   });
-
-//   it("Insert and remove 100 numbers randomly", async () => {
-//       function perm(a) {
-//           const arr = a.slice();
-//           const rArr = [];
-//           for (let i=0; i<arr.length; i++) {
-//               let rIdx = Math.floor(Math.random() * (arr.length - i));
-//               rArr.push(arr[rIdx]);
-//               arr[rIdx] = arr[arr.length - i - 1];
-//           }
-//           return rArr;
-//       }
-//       const tree = await smt.newMemEmptyTrie();
-//       const arr = [];
-//       const N = 100;
-//       for (let i=0; i<N; i++) {
-//           arr.push(bigInt(i));
-//       }
-//       const insArr = perm(arr);
-//       for (let i=0; i<N; i++) {
-//           await tree.insert(insArr[i], i);
-//       }
-//       const delArr = perm(insArr);
-//       for (let i=0; i<N; i++) {
-//           await tree.delete(delArr[i]);
-//       }
-
-//       assert(tree.root.isZero());
-//       assert.equal(Object.keys(tree.db.nodes).length, 0);
-//   });
-
-//   it("Should test update", async () => {
-//       const tree1 = await smt.newMemEmptyTrie();
-//       const tree2 = await smt.newMemEmptyTrie();
-
-//       await tree1.insert(8,88);
-//       await tree1.insert(9,99,);
-//       await tree1.insert(32,3232);
-
-//       await tree2.insert(8,888);
-//       await tree2.insert(9,999);
-//       await tree2.insert(32,323232);
-
-//       await tree1.update(8, 888);
-//       await tree1.update(9, 999);
-//       await tree1.update(32, 323232);
-
-//       assert(tree1.root.equals(tree2.root));
-//   });
+    it("Add claims in different orders", async () => {
+        const tree1 = await smt.newMemEmptyTrie();
+        for (let i = 0; i < 16; i++) {
+            const claim = [bigInt(0), bigInt(i), bigInt(0), bigInt(i)];
+            const entries = newEntry(claim);
+            await tree1.insert(entries.hi, entries.hv);
+        }
+        const tree2 = await smt.newMemEmptyTrie();
+        for (let i = 0; i < 16; i++) {
+            const claim = [bigInt(0), bigInt(i), bigInt(0), bigInt(i)];
+            const entries = newEntry(claim);
+            await tree2.insert(entries.hi, entries.hv);
+        }
+        const root1 = bigIntToBuffer(tree1.root);
+        const root2 = bigIntToBuffer(tree2.root);
+        expect(bytesToHex(root1)).to.be.equal(bytesToHex(root2));
+        expect(bytesToHex(root1)).to.be.equal("0x173fd27f6622526dfb21c4d8d83e3c95adba5d8f46a397113e4e80e629c6de76");
+    });
 
-// });
\ No newline at end of file
+    it("Insert 3 elements in different order into different trees", async () => {
+        const claim1 = [bigInt(33), bigInt(44), bigInt(55), bigInt(66)];
+        const entries1 = newEntry(claim1);
+        const claim2 = [bigInt(1111), bigInt(2222), bigInt(3333), bigInt(4444)];
+        const entries2 = newEntry(claim2);
+        const claim3 = [bigInt(5555), bigInt(6666), bigInt(7777), bigInt(8888)];
+        const entries3 = newEntry(claim3);
+      
+        const tree1 = await smt.newMemEmptyTrie();
+        const tree2 = await smt.newMemEmptyTrie();
+        const tree3 = await smt.newMemEmptyTrie();
+        const tree4 = await smt.newMemEmptyTrie();
+        const tree5 = await smt.newMemEmptyTrie();
+        const tree6 = await smt.newMemEmptyTrie();
+
+        await tree1.insert(entries1.hi,entries1.hv);
+        await tree1.insert(entries2.hi,entries2.hv);
+        await tree1.insert(entries3.hi,entries3.hv);
+
+        await tree2.insert(entries1.hi,entries1.hv);
+        await tree2.insert(entries3.hi,entries3.hv);
+        await tree2.insert(entries2.hi,entries2.hv);
+
+        await tree3.insert(entries2.hi,entries2.hv);
+        await tree3.insert(entries1.hi,entries1.hv);
+        await tree3.insert(entries3.hi,entries3.hv);
+
+        await tree4.insert(entries2.hi,entries2.hv);
+        await tree4.insert(entries3.hi,entries3.hv);
+        await tree4.insert(entries1.hi,entries1.hv);
+
+        await tree5.insert(entries3.hi,entries3.hv);
+        await tree5.insert(entries1.hi,entries1.hv);
+        await tree5.insert(entries2.hi,entries2.hv);
+
+        await tree6.insert(entries3.hi,entries3.hv);
+        await tree6.insert(entries2.hi,entries2.hv);
+        await tree6.insert(entries1.hi,entries1.hv);
+        
+        const root1 = bigIntToBuffer(tree1.root);
+        const root2 = bigIntToBuffer(tree2.root);
+        const root3 = bigIntToBuffer(tree3.root);
+        const root4 = bigIntToBuffer(tree4.root);
+        const root5 = bigIntToBuffer(tree5.root);
+        const root6 = bigIntToBuffer(tree6.root);
+
+        expect(bytesToHex(root1)).to.be.equal(bytesToHex(root2));
+        expect(bytesToHex(root2)).to.be.equal(bytesToHex(root3));
+        expect(bytesToHex(root3)).to.be.equal(bytesToHex(root4));
+        expect(bytesToHex(root4)).to.be.equal(bytesToHex(root5));
+        expect(bytesToHex(root5)).to.be.equal(bytesToHex(root6));
+        
+        expect(bytesToHex(root1)).to.be.equal("0x27990ef22656f49f010b2b48b2418c46f2bc93e4afb2e3377a1eb09f129e9802");
+    });
+});
\ No newline at end of file