diff --git a/test-basic/fromDocDescriptors-test.js b/test-basic/fromDocDescriptors-test.js
index d349188d..422296be 100644
--- a/test-basic/fromDocDescriptors-test.js
+++ b/test-basic/fromDocDescriptors-test.js
@@ -9,6 +9,7 @@ const testlib = require("../etc/test-lib");
 const db = marklogic.createDatabaseClient(testconfig.restAdminConnection);
 const op = marklogic.planBuilder;
 let serverConfiguration = {};
+const assert = require('assert');
 describe('optic-update fromDocDescriptors tests', function() {
     this.timeout(10000);
     before(function (done) {
@@ -128,12 +129,16 @@ describe('optic-update fromDocDescriptors tests', function() {
         });
 
         it('test with wrong type of argument', function (done) {
-            try {
-                db.rows.query(op.fromDocDescriptors('asd'))
-            } catch (e) {
-                e.toString().includes('Error: doc-descriptor argument at 0 of PlanBuilder.fromDocDescriptors() must be a PlanDocDescriptor value');
-                done();
-            }
+            db.rows.query(op.fromDocDescriptors('asd'))
+                .catch(error => {
+                    try{
+                        assert(error.body.errorResponse.message.toString()
+                            .includes('Invalid arguments: fromDocDescriptors - expects an array/sequence or object as input.'))
+                        done();
+                    } catch(error){
+                        done(error);
+                    }
+                })
         });
 
         it('test with one doc descriptor', function (done) {
diff --git a/test-complete/nodejs-graphs-content-type.js b/test-complete/nodejs-graphs-content-type.js
index febf2c83..7eb9e0d7 100644
--- a/test-complete/nodejs-graphs-content-type.js
+++ b/test-complete/nodejs-graphs-content-type.js
@@ -143,9 +143,9 @@ describe('content type graph test', function () {
             result(function (response) {
                 //console.log(JSON.stringify(response, null, 2));
                 response.should.containEql('<title>SPARQL results</title>');
-                response.should.containEql('<a href=\"/v1/graphs/things?iri=http%3a//marklogicsparql.com/id%231111\">http://marklogicsparql.com/id#1111</a>');
+                response.toString().includes('<a href=\"/v1/graphs/things?iri=http%3a//marklogicsparql.com/id%231111\">http://marklogicsparql.com/id#1111</a>');
                 done();
-            }, done);
+            }).catch(error => done(error));
     });
 
     it('should run SPARQL query with n-triples content type', function (done) {
diff --git a/test-complete/nodejs-optic-generate-views.js b/test-complete/nodejs-optic-generate-views.js
index 32a8ecfa..d4ad3e5a 100644
--- a/test-complete/nodejs-optic-generate-views.js
+++ b/test-complete/nodejs-optic-generate-views.js
@@ -50,12 +50,6 @@ const dbClient = marklogic.createDatabaseClient(
 
 const pb = marklogic.planBuilder;
 
-function waitForViewCreate(wTime) {
-    return it('View creation delay', done => {
-        setTimeout(() => done(), wTime);
-
-    }).timeout(wTime + 120);
-}
 
 describe('Nodejs Optic generate views test', function () {
     this.timeout(20000);
@@ -89,13 +83,11 @@ describe('Nodejs Optic generate views test', function () {
                     content: res
                 }).
                     result(function (response) {
-                        //	console.log(JSON.stringify(response, null, 4));
-                    done();
+                    setTimeout(()=> done(), 10120);
                     });
             }).catch(error=>done(error));
     });
 
-    waitForViewCreate(10000);
 
     it('TEST 1a - Verify InnerJoin keymatch view', function (done) {
         const qv = pb.fromView('InnerJoin', 'keymatch');
@@ -145,13 +137,11 @@ describe('Nodejs Optic generate views test', function () {
                     content: res
                 }).
                     result(function (response) {
-                        //	console.log(JSON.stringify(response, null, 4));
-                    done();
+                    setTimeout(()=> done(), 10120);
                     });
             }).catch(error=>done(error));
     });
 
-    waitForViewCreate(10000);
 
     it('TEST 2a - Verify sparql groupmin view', function (done) {
         const qv = pb.fromView('sparql', 'groupmin');
@@ -204,14 +194,11 @@ describe('Nodejs Optic generate views test', function () {
                     content: res
                 }).
                     result(function (response) {
-                        //	console.log(JSON.stringify(response, null, 4));
-                    done();
+                    setTimeout(()=> done(), 10120);
                     });
             }).catch(error=>done(error));
     });
 
-    waitForViewCreate(10000);
-
     it('TEST 3a - Verify sparql groupmin view', function (done) {
         const qv = pb.fromView('lexicons', 'orderbyselect');
 
diff --git a/test-complete/nodejs-optic-nodes.js b/test-complete/nodejs-optic-nodes.js
index 001b65ea..69803105 100644
--- a/test-complete/nodejs-optic-nodes.js
+++ b/test-complete/nodejs-optic-nodes.js
@@ -90,7 +90,7 @@ describe('Nodejs Optic nodes json constructor test', function () {
                 expect(output.rows[3]['myItem.rowId']).to.equal(4);
                 expect(output.rows[3].xml).to.equal('<root attrA="4"><elemA>red</elemA><!--this is a comment for hoop--><elemB>hoop</elemB></root>');
                 done();
-            }, done);
+            }).catch(error => done(error));
     });
 
     it('TEST 2 - construct json from views', function (done) {