diff --git a/tests/js/server/dump/dump-mmfiles.js b/tests/js/server/dump/dump-mmfiles.js
index 546192aa7080..8e64b8ec7f5e 100644
--- a/tests/js/server/dump/dump-mmfiles.js
+++ b/tests/js/server/dump/dump-mmfiles.js
@@ -91,8 +91,17 @@ function dumpTestSuite () {
       assertEqual(100000, c.count());
 
       // test all documents
-      for (var i = 0; i < 100000; ++i) {
-        var doc = c.document("test" + i);
+      let docs = [], results = [];
+      for (let i = 0; i < 100000; ++i) {
+        docs.push("test" + i);
+        if (docs.length === 10000) {
+          results = results.concat(c.document(docs));
+          docs = [];
+        }
+      }
+
+      for (let i = 0; i < 100000; ++i) {
+        let doc = results[i];
         assertEqual(i, doc.value1);
         assertEqual("this is a test", doc.value2);
         assertEqual("test" + i, doc.value3);
diff --git a/tests/js/server/dump/dump-multiple-rocksdb.js b/tests/js/server/dump/dump-multiple-rocksdb.js
index 4cba1398adc4..05d165a170b8 100644
--- a/tests/js/server/dump/dump-multiple-rocksdb.js
+++ b/tests/js/server/dump/dump-multiple-rocksdb.js
@@ -89,8 +89,17 @@ function dumpTestSuite () {
       assertEqual(100000, c.count());
 
       // test all documents
-      for (var i = 0; i < 100000; ++i) {
-        var doc = c.document("test" + i);
+      let docs = [], results = [];
+      for (let i = 0; i < 100000; ++i) {
+        docs.push("test" + i);
+        if (docs.length === 10000) {
+          results = results.concat(c.document(docs));
+          docs = [];
+        }
+      }
+
+      for (let i = 0; i < 100000; ++i) {
+        let doc = results[i];
         assertEqual(i, doc.value1);
         assertEqual("this is a test", doc.value2);
         assertEqual("test" + i, doc.value3);
@@ -157,13 +166,11 @@ function dumpTestSuite () {
       assertEqual("primary", c.getIndexes()[0].type);
       assertEqual(9000, c.count());
 
-      var i;
-      for (i = 0; i < 10000; ++i) {
+      for (let i = 0; i < 10000; ++i) {
         if (i % 10 === 0) {
           assertFalse(c.exists("test" + i));
-        }
-        else {
-          var doc = c.document("test" + i);
+        } else {
+          let doc = c.document("test" + i);
           assertEqual(i, doc.value1);
 
           if (i < 1000) {
diff --git a/tests/js/server/dump/dump-rocksdb-cluster.js b/tests/js/server/dump/dump-rocksdb-cluster.js
index 728ead760372..b94fc766e9c1 100644
--- a/tests/js/server/dump/dump-rocksdb-cluster.js
+++ b/tests/js/server/dump/dump-rocksdb-cluster.js
@@ -44,20 +44,6 @@ function dumpTestSuite () {
 
   return {
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief set up
-////////////////////////////////////////////////////////////////////////////////
-
-    setUp : function () {
-    },
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief tear down
-////////////////////////////////////////////////////////////////////////////////
-
-    tearDown : function () {
-    },
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test the empty collection
 ////////////////////////////////////////////////////////////////////////////////
@@ -160,13 +146,11 @@ function dumpTestSuite () {
       assertEqual("primary", c.getIndexes()[0].type);
       assertEqual(9000, c.count());
 
-      var i;
-      for (i = 0; i < 10000; ++i) {
+      for (let i = 0; i < 10000; ++i) {
         if (i % 10 === 0) {
           assertFalse(c.exists("test" + i));
-        }
-        else {
-          var doc = c.document("test" + i);
+        } else {
+          let doc = c.document("test" + i);
           assertEqual(i, doc.value1);
 
           if (i < 1000) {
diff --git a/tests/js/server/dump/dump-rocksdb-modified.js b/tests/js/server/dump/dump-rocksdb-modified.js
index e9e6ff532530..daa2080543f4 100644
--- a/tests/js/server/dump/dump-rocksdb-modified.js
+++ b/tests/js/server/dump/dump-rocksdb-modified.js
@@ -38,20 +38,6 @@ function dumpTestSuite () {
 
   return {
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief set up
-////////////////////////////////////////////////////////////////////////////////
-
-    setUp : function () {
-    },
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief tear down
-////////////////////////////////////////////////////////////////////////////////
-
-    tearDown : function () {
-    },
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test the empty collection
 ////////////////////////////////////////////////////////////////////////////////
@@ -87,8 +73,18 @@ function dumpTestSuite () {
       assertEqual(100000, c.count());
 
       // test all documents
-      for (var i = 1; i < 200000; i += 2) {
-        var doc = c.document("test" + i);
+      let docs = [], results = [];
+      for (let i = 1; i < 200000; i += 2) {
+        docs.push("test" + i);
+        if (docs.length === 10000) {
+          results = results.concat(c.document(docs));
+          docs = [];
+        }
+      }
+
+      let j = 0;
+      for (let i = 1; i < 200000; i += 2) {
+        let doc = results[j++];
         assertEqual(i, doc.value1);
         assertEqual("this is a test", doc.value2);
         assertEqual("test" + i, doc.value3);
@@ -156,12 +152,10 @@ function dumpTestSuite () {
       assertEqual("primary", c.getIndexes()[0].type);
       assertEqual(8001, c.count());
 
-      var i;
-      for (i = 0; i < 10000; ++i) {
+      for (let i = 0; i < 10000; ++i) {
         if (i % 5 === 0) {
           assertFalse(c.exists("test" + i));
-        }
-        else {
+        } else {
           let doc = c.document("test" + i);
           assertEqual(i, doc.value1);
 
@@ -367,8 +361,7 @@ function dumpTestSuite () {
         assertEqual("this is a test", doc.value2);
         if (i % 2 === 0) {
           assertEqual(i, doc.value3);
-        }
-        else {
+        } else {
           assertEqual("test" + i, doc.value3);
         }
       }
diff --git a/tests/js/server/dump/dump-rocksdb-modify.js b/tests/js/server/dump/dump-rocksdb-modify.js
index 69c31558c807..77d501298936 100644
--- a/tests/js/server/dump/dump-rocksdb-modify.js
+++ b/tests/js/server/dump/dump-rocksdb-modify.js
@@ -38,20 +38,6 @@ function dumpTestSuite () {
 
   return {
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief set up
-////////////////////////////////////////////////////////////////////////////////
-
-    setUp : function () {
-    },
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief tear down
-////////////////////////////////////////////////////////////////////////////////
-
-    tearDown : function () {
-    },
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test the empty collection
 ////////////////////////////////////////////////////////////////////////////////
@@ -83,30 +69,45 @@ function dumpTestSuite () {
 
       assertEqual(100000, c.count());
 
-      // remove half of the documents
-      let l = [];
-      for (let i = 0; i < 100000; i+=2) {
-        var doc = c.document("test" + i);
+      let l = [], results = [];
+      for (let i = 0; i < 100000; i += 2) {
+        l.push("test" + i);
+        if (l.length === 10000) {
+          results = results.concat(c.document(l));
+          l = [];
+        }
+      }
+
+      let j = 0;
+      for (let i = 0; i < 100000; i += 2) {
+        let doc = results[j++];
         assertEqual(i, doc.value1);
         assertEqual("this is a test", doc.value2);
         assertEqual("test" + i, doc.value3);
+      }
+
+      // remove half of the documents
+      j = 0;
+      for (let i = 0; i < 100000; i += 2) {
+        let doc = results[j++];
         l.push(doc._key);
         if (l.length === 10000) {
           c.remove(l);
           l = [];
         }
       }
+
       // add another bunch of documents
       l = [];
-      for (let i = 100001; i < 200000; i+=2) {
-        l.push({_key: 'test'+i ,
+      for (let i = 100001; i < 200000; i += 2) {
+        l.push({_key: 'test' + i ,
                 abc: i,
                 value1: i,
                 value2: "this is a test", 
                 value3: "test" + i
                });
         if (l.length === 10000) {
-          c.save(l);
+          c.insert(l);
           l = [];
         }
       }
@@ -183,9 +184,11 @@ function dumpTestSuite () {
       assertEqual(9000, c.count());
 
       c.ensureIndex({type: "hash", fields: ["abc"]});
-      for (var i = 5; i < 10000; i+=10) {
-        c.remove("test" + i);
+      let docs = [];
+      for (let i = 5; i < 10000; i += 10) {
+        docs.push("test" + i);
       }
+      c.remove(docs);
       c.save({ _key: "test" + 999999, value: 999999 });
     },
 
diff --git a/tests/js/server/dump/dump-rocksdb.js b/tests/js/server/dump/dump-rocksdb.js
index dbefb055afcc..0a02489772e8 100644
--- a/tests/js/server/dump/dump-rocksdb.js
+++ b/tests/js/server/dump/dump-rocksdb.js
@@ -90,8 +90,16 @@ function dumpTestSuite () {
       assertEqual(100000, c.count());
 
       // test all documents
-      for (var i = 0; i < 100000; ++i) {
-        var doc = c.document("test" + i);
+      let docs = [], results = [];
+      for (let i = 0; i < 100000; ++i) {
+        docs.push("test" + i);
+        if (docs.length === 10000) {
+          results = results.concat(c.document(docs));
+          docs = [];
+        }
+      }
+      for (let i = 0; i < 100000; ++i) {
+        let doc = results[i];
         assertEqual(i, doc.value1);
         assertEqual("this is a test", doc.value2);
         assertEqual("test" + i, doc.value3);
@@ -158,13 +166,11 @@ function dumpTestSuite () {
       assertEqual("primary", c.getIndexes()[0].type);
       assertEqual(9000, c.count());
 
-      var i;
-      for (i = 0; i < 10000; ++i) {
+      for (let i = 0; i < 10000; ++i) {
         if (i % 10 === 0) {
           assertFalse(c.exists("test" + i));
-        }
-        else {
-          var doc = c.document("test" + i);
+        } else {
+          let doc = c.document("test" + i);
           assertEqual(i, doc.value1);
 
           if (i < 1000) {