diff --git a/lerna.json b/lerna.json
index fdf9f330d3..390c86e1dd 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-rc.4",
+  "lerna": "2.0.0",
   "packages": [
     "packages/*"
   ],
diff --git a/package.json b/package.json
index 6fd1a33d86..77e7ee0acb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "colors": "^1.1.2",
-    "lerna": "^2.0.0-rc.4",
+    "lerna": "^2.0.0",
     "licensecheck": "^1.3.0",
     "moment": "^2.17.1",
     "semver": "^5.3.0",
@@ -32,4 +32,4 @@
   ],
   "author": "Hyperledger Composer",
   "license": "Apache-2.0"
-}
\ No newline at end of file
+}
diff --git a/packages/composer-admin/package.json b/packages/composer-admin/package.json
index 384dc3a8e9..d40136764b 100644
--- a/packages/composer-admin/package.json
+++ b/packages/composer-admin/package.json
@@ -36,10 +36,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "dependencies": {
     "composer-common": "0.10.1",
diff --git a/packages/composer-admin/test/adminconnection.js b/packages/composer-admin/test/adminconnection.js
index 4fae3d9433..c642c64737 100644
--- a/packages/composer-admin/test/adminconnection.js
+++ b/packages/composer-admin/test/adminconnection.js
@@ -30,7 +30,6 @@ const should = chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 describe('AdminConnection', () => {
 
diff --git a/packages/composer-cli/lib/cmds/identity/importCommand.js b/packages/composer-cli/lib/cmds/identity/importCommand.js
index 90bf7ffad6..7cf0ef0253 100644
--- a/packages/composer-cli/lib/cmds/identity/importCommand.js
+++ b/packages/composer-cli/lib/cmds/identity/importCommand.js
@@ -26,12 +26,5 @@ module.exports.builder = {
 };
 
 module.exports.handler = (argv) => {
-    argv.thePromise =  Import.handler(argv)
-    .then(() => {
-        return;
-    })
-    .catch((error) => {
-        throw error;
-    });
-    return argv.thePromise;
+    return Import.handler(argv);
 };
diff --git a/packages/composer-cli/package.json b/packages/composer-cli/package.json
index 48e48feda4..a535ceb842 100644
--- a/packages/composer-cli/package.json
+++ b/packages/composer-cli/package.json
@@ -34,10 +34,9 @@
     "chai-things": "^0.2.0",
     "eslint": "^3.17.1",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "dependencies": {
     "chalk": "^1.1.3",
diff --git a/packages/composer-cli/test/archive/create.js b/packages/composer-cli/test/archive/create.js
index 344b472401..1dcb218404 100644
--- a/packages/composer-cli/test/archive/create.js
+++ b/packages/composer-cli/test/archive/create.js
@@ -26,7 +26,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/archive/list.js b/packages/composer-cli/test/archive/list.js
index 493aef3f81..9122a300b3 100644
--- a/packages/composer-cli/test/archive/list.js
+++ b/packages/composer-cli/test/archive/list.js
@@ -26,7 +26,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/generator/createCode.js b/packages/composer-cli/test/generator/createCode.js
index 7c8f9b4c84..edc79305b3 100644
--- a/packages/composer-cli/test/generator/createCode.js
+++ b/packages/composer-cli/test/generator/createCode.js
@@ -36,7 +36,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/identity/bind.js b/packages/composer-cli/test/identity/bind.js
index 15641a0ed9..3be6e4697c 100644
--- a/packages/composer-cli/test/identity/bind.js
+++ b/packages/composer-cli/test/identity/bind.js
@@ -21,7 +21,6 @@ const Bind = require('../../lib/cmds/identity/bindCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/identity/import.js b/packages/composer-cli/test/identity/import.js
index 81745d59fc..aedba95e52 100644
--- a/packages/composer-cli/test/identity/import.js
+++ b/packages/composer-cli/test/identity/import.js
@@ -21,7 +21,6 @@ const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 const fs = require('fs');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
@@ -75,7 +74,7 @@ describe('composer identity import CLI unit tests', () => {
 
         let fsStub = sandbox.stub(fs, 'readFileSync').withArgs(CERT_PATH).returns('acert');
         fsStub.withArgs(KEY_PATH).returns('akey');
-        mockAdminConnection.importIdentity.withArgs(PROFILE_NAME, USER_ID, 'acert', 'akey').rejects('some error');
+        mockAdminConnection.importIdentity.withArgs(PROFILE_NAME, USER_ID, 'acert', 'akey').rejects('Error', 'some error');
         return Import.handler(argv)
             .should.be.rejectedWith(/some error/);
     });
diff --git a/packages/composer-cli/test/identity/issue.js b/packages/composer-cli/test/identity/issue.js
index 1348ca7018..5ca2070c11 100644
--- a/packages/composer-cli/test/identity/issue.js
+++ b/packages/composer-cli/test/identity/issue.js
@@ -21,7 +21,6 @@ const Issue = require('../../lib/cmds/identity/issueCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/identity/revoke.js b/packages/composer-cli/test/identity/revoke.js
index b8bb9a9399..b13c3260d2 100644
--- a/packages/composer-cli/test/identity/revoke.js
+++ b/packages/composer-cli/test/identity/revoke.js
@@ -21,7 +21,6 @@ const Revoke = require('../../lib/cmds/identity/revokeCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/index.js b/packages/composer-cli/test/index.js
index 20f662b3ac..b9430416fb 100644
--- a/packages/composer-cli/test/index.js
+++ b/packages/composer-cli/test/index.js
@@ -22,7 +22,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/network/deploy.js b/packages/composer-cli/test/network/deploy.js
index 9670b7d517..c749e54e48 100644
--- a/packages/composer-cli/test/network/deploy.js
+++ b/packages/composer-cli/test/network/deploy.js
@@ -27,7 +27,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/network/download.js b/packages/composer-cli/test/network/download.js
index 2a2e83e495..6432f9dd4c 100644
--- a/packages/composer-cli/test/network/download.js
+++ b/packages/composer-cli/test/network/download.js
@@ -28,7 +28,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/network/list.js b/packages/composer-cli/test/network/list.js
index a0d9fe073d..c40cda9115 100644
--- a/packages/composer-cli/test/network/list.js
+++ b/packages/composer-cli/test/network/list.js
@@ -29,7 +29,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/network/loglevel.js b/packages/composer-cli/test/network/loglevel.js
index 10f35dd289..f1a64c26e9 100644
--- a/packages/composer-cli/test/network/loglevel.js
+++ b/packages/composer-cli/test/network/loglevel.js
@@ -20,7 +20,6 @@ const LogLevel = require('../../lib/cmds/network/loglevelCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/network/ping.js b/packages/composer-cli/test/network/ping.js
index 275ab42d0c..a6ecff1674 100644
--- a/packages/composer-cli/test/network/ping.js
+++ b/packages/composer-cli/test/network/ping.js
@@ -21,7 +21,6 @@ const Ping = require('../../lib/cmds/network/pingCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 const BUSINESS_NETWORK_NAME = 'net.biz.TestNetwork-0.0.1';
 const DEFAULT_PROFILE_NAME = 'defaultProfile';
diff --git a/packages/composer-cli/test/network/start.js b/packages/composer-cli/test/network/start.js
index 1c0ae43c8d..4739ec967d 100644
--- a/packages/composer-cli/test/network/start.js
+++ b/packages/composer-cli/test/network/start.js
@@ -25,7 +25,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/network/undeploy.js b/packages/composer-cli/test/network/undeploy.js
index 264909bbe9..c42fdad150 100644
--- a/packages/composer-cli/test/network/undeploy.js
+++ b/packages/composer-cli/test/network/undeploy.js
@@ -24,7 +24,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/participant/add.js b/packages/composer-cli/test/participant/add.js
index 942a9db9f2..d49354a88e 100644
--- a/packages/composer-cli/test/participant/add.js
+++ b/packages/composer-cli/test/participant/add.js
@@ -27,7 +27,6 @@ const Add = require('../../lib/cmds/participant/addCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/runtime/install.js b/packages/composer-cli/test/runtime/install.js
index f717a8c5ec..a8b3b771ae 100644
--- a/packages/composer-cli/test/runtime/install.js
+++ b/packages/composer-cli/test/runtime/install.js
@@ -24,7 +24,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/shell/shelltest.js b/packages/composer-cli/test/shell/shelltest.js
index 0379f971ae..02a76a027c 100644
--- a/packages/composer-cli/test/shell/shelltest.js
+++ b/packages/composer-cli/test/shell/shelltest.js
@@ -26,7 +26,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/transaction/submit.js b/packages/composer-cli/test/transaction/submit.js
index a47c7d490b..aa527d704c 100644
--- a/packages/composer-cli/test/transaction/submit.js
+++ b/packages/composer-cli/test/transaction/submit.js
@@ -28,7 +28,6 @@ const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 const chai = require('chai');
 const sinon = require('sinon');
 
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-cli/test/utils/cmdutils.js b/packages/composer-cli/test/utils/cmdutils.js
index 0cdc253fda..c95e0320f2 100644
--- a/packages/composer-cli/test/utils/cmdutils.js
+++ b/packages/composer-cli/test/utils/cmdutils.js
@@ -20,7 +20,7 @@ const fs = require('fs');
 const chai = require('chai');
 const sinon = require('sinon');
 
-require('sinon-as-promised');
+
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));
diff --git a/packages/composer-client/package.json b/packages/composer-client/package.json
index b7f63fe2d5..696f4ecb77 100644
--- a/packages/composer-client/package.json
+++ b/packages/composer-client/package.json
@@ -54,10 +54,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "nyc": {
     "exclude": [
diff --git a/packages/composer-client/test/assetregistry.js b/packages/composer-client/test/assetregistry.js
index 445f0fe6c4..cc7f8f049c 100644
--- a/packages/composer-client/test/assetregistry.js
+++ b/packages/composer-client/test/assetregistry.js
@@ -27,7 +27,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('AssetRegistry', () => {
 
diff --git a/packages/composer-client/test/businessnetworkconnection.js b/packages/composer-client/test/businessnetworkconnection.js
index fe5ae21cda..8fb6bd6c7f 100644
--- a/packages/composer-client/test/businessnetworkconnection.js
+++ b/packages/composer-client/test/businessnetworkconnection.js
@@ -40,7 +40,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('BusinessNetworkConnection', () => {
 
diff --git a/packages/composer-client/test/participantregistry.js b/packages/composer-client/test/participantregistry.js
index 86a5a19cb7..595eff71e7 100644
--- a/packages/composer-client/test/participantregistry.js
+++ b/packages/composer-client/test/participantregistry.js
@@ -27,7 +27,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('ParticipantRegistry', () => {
 
diff --git a/packages/composer-client/test/registry.js b/packages/composer-client/test/registry.js
index e9b3880e52..ebcc375040 100644
--- a/packages/composer-client/test/registry.js
+++ b/packages/composer-client/test/registry.js
@@ -27,7 +27,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Registry', () => {
 
diff --git a/packages/composer-common/package.json b/packages/composer-common/package.json
index 2dad9572bf..0aac93557b 100644
--- a/packages/composer-common/package.json
+++ b/packages/composer-common/package.json
@@ -44,12 +44,11 @@
     "folder-zip-sync": "^1.0.4",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
+    "mocha": "^3.4.2",
     "mockery": "^2.0.0",
-    "nyc": "^10.1.2",
+    "nyc": "^11.1.0",
     "pegjs": "^0.9.0",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "sinon": "^2.3.8"
   },
   "dependencies": {
     "acorn": "^4.0.3",
diff --git a/packages/composer-common/test/comboconnectionprofilestore.js b/packages/composer-common/test/comboconnectionprofilestore.js
index 4c090c7e06..6c7dcf11db 100644
--- a/packages/composer-common/test/comboconnectionprofilestore.js
+++ b/packages/composer-common/test/comboconnectionprofilestore.js
@@ -21,7 +21,6 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 describe('ComboConnectionProfileStore', () => {
 
diff --git a/packages/composer-common/test/fsconnectionprofilestore.js b/packages/composer-common/test/fsconnectionprofilestore.js
index b75b85d82c..514b520c64 100644
--- a/packages/composer-common/test/fsconnectionprofilestore.js
+++ b/packages/composer-common/test/fsconnectionprofilestore.js
@@ -27,7 +27,6 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 [homedir(), null].forEach((homedir) => {
 
diff --git a/packages/composer-common/test/memoryconnectionprofilestore.js b/packages/composer-common/test/memoryconnectionprofilestore.js
index 0001492d0a..78afba4edb 100644
--- a/packages/composer-common/test/memoryconnectionprofilestore.js
+++ b/packages/composer-common/test/memoryconnectionprofilestore.js
@@ -27,7 +27,6 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 describe('MemoryConnectionProfileStore', () => {
 
diff --git a/packages/composer-connector-embedded/package.json b/packages/composer-connector-embedded/package.json
index 0842f2ae2a..5f054db34a 100644
--- a/packages/composer-connector-embedded/package.json
+++ b/packages/composer-connector-embedded/package.json
@@ -45,10 +45,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8",
     "watchify": "^3.7.0"
   },
   "dependencies": {
diff --git a/packages/composer-connector-embedded/test/embeddedconnection.js b/packages/composer-connector-embedded/test/embeddedconnection.js
index 9d3768f566..ef7bba6e52 100644
--- a/packages/composer-connector-embedded/test/embeddedconnection.js
+++ b/packages/composer-connector-embedded/test/embeddedconnection.js
@@ -31,7 +31,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EmbeddedConnection', () => {
 
diff --git a/packages/composer-connector-embedded/test/embeddedconnectionmanager.js b/packages/composer-connector-embedded/test/embeddedconnectionmanager.js
index 8a6f647566..635690bcf8 100644
--- a/packages/composer-connector-embedded/test/embeddedconnectionmanager.js
+++ b/packages/composer-connector-embedded/test/embeddedconnectionmanager.js
@@ -25,7 +25,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EmbeddedConnectionManager', () => {
 
diff --git a/packages/composer-connector-hlf/package.json b/packages/composer-connector-hlf/package.json
index 1bf4b3bf5a..a4974a288d 100644
--- a/packages/composer-connector-hlf/package.json
+++ b/packages/composer-connector-hlf/package.json
@@ -54,10 +54,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "nyc": {
     "exclude": [
diff --git a/packages/composer-connector-hlf/test/hfcconnection.js b/packages/composer-connector-hlf/test/hfcconnection.js
index 118e88a55a..a5e55bcd15 100644
--- a/packages/composer-connector-hlf/test/hfcconnection.js
+++ b/packages/composer-connector-hlf/test/hfcconnection.js
@@ -32,7 +32,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('HFCConnection', () => {
 
diff --git a/packages/composer-connector-hlf/test/hfcwalletproxy.js b/packages/composer-connector-hlf/test/hfcwalletproxy.js
index 3a299ca716..a9de93c978 100644
--- a/packages/composer-connector-hlf/test/hfcwalletproxy.js
+++ b/packages/composer-connector-hlf/test/hfcwalletproxy.js
@@ -19,7 +19,7 @@ const Wallet = require('composer-common').Wallet;
 
 require('chai').should();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('HFCWalletProxy', () => {
 
@@ -76,7 +76,7 @@ describe('HFCWalletProxy', () => {
 
         it('should pass back any errors from the wallet', () => {
             mockWallet.contains.withArgs('bob1').resolves(true);
-            mockWallet.get.withArgs('bob1').rejects('ENOPERM');
+            mockWallet.get.withArgs('bob1').rejects('Error', 'ENOPERM');
             let cb = sinon.stub();
             return walletProxy.getValue('member.bob1', cb)
                 .then(() => {
@@ -115,7 +115,7 @@ describe('HFCWalletProxy', () => {
 
         it('should pass back any errors from the wallet', () => {
             mockWallet.contains.withArgs('bob1').resolves(true);
-            mockWallet.update.withArgs('bob1').rejects('ENOPERM');
+            mockWallet.update.withArgs('bob1').rejects('Error', 'ENOPERM');
             let cb = sinon.stub();
             return walletProxy.setValue('member.bob1', 'hello world', cb)
                 .then(() => {
diff --git a/packages/composer-connector-hlfv1/package.json b/packages/composer-connector-hlfv1/package.json
index 67ca01af0b..3a403892dd 100644
--- a/packages/composer-connector-hlfv1/package.json
+++ b/packages/composer-connector-hlfv1/package.json
@@ -56,10 +56,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "nyc": {
     "exclude": [
diff --git a/packages/composer-connector-hlfv1/test/hlfconnection.js b/packages/composer-connector-hlfv1/test/hlfconnection.js
index 27c4536df4..f76e5c48b1 100644
--- a/packages/composer-connector-hlfv1/test/hlfconnection.js
+++ b/packages/composer-connector-hlfv1/test/hlfconnection.js
@@ -41,7 +41,7 @@ const originalVersion = connectorPackageJSON.version;
 const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
-require('sinon-as-promised');
+
 
 const runtimeModulePath = path.dirname(require.resolve('composer-runtime-hlfv1'));
 
diff --git a/packages/composer-connector-hlfv1/test/hlfconnectionmanager.js b/packages/composer-connector-hlfv1/test/hlfconnectionmanager.js
index 08ff0fc47e..625a7c0a97 100644
--- a/packages/composer-connector-hlfv1/test/hlfconnectionmanager.js
+++ b/packages/composer-connector-hlfv1/test/hlfconnectionmanager.js
@@ -32,7 +32,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 const fs = require('fs');
 
 const Logger = require('composer-common').Logger;
@@ -933,7 +933,6 @@ describe('HLFConnectionManager', () => {
                     sinon.assert.calledWith(mockClient.setStateStore, mockKeyValueStore);
                     sinon.assert.calledOnce(Client.newCryptoSuite);
                     sinon.assert.calledOnce(mockClient.setCryptoSuite);
-//                    sinon.assert.calledWith(mockClient.newCryptoSuite, null, null, { path: '/tmp/hlfabric1' });
                     sinon.assert.calledOnce(mockClient.createUser);
                     sinon.assert.calledWith(mockClient.createUser, {
                         username: 'anid',
@@ -1021,7 +1020,7 @@ describe('HLFConnectionManager', () => {
         });
 
         it('should handle an error creating a default key value store', () => {
-            Client.newDefaultKeyValueStore.rejects('wow such fail');
+            Client.newDefaultKeyValueStore.rejects('Error','wow such fail');
             return connectionManager.importIdentity('connprof1', profile, 'anid', 'acert', 'akey')
                 .should.be.rejectedWith(/wow such fail/);
         });
@@ -1033,7 +1032,7 @@ describe('HLFConnectionManager', () => {
         });
 
         it('should handle an error creating a user', () => {
-            mockClient.createUser.rejects('wow such fail');
+            mockClient.createUser.rejects('Error','wow such fail');
             return connectionManager.importIdentity('connprof1', profile, 'anid', 'acert', 'akey')
                 .should.be.rejectedWith(/wow such fail/);
         });
diff --git a/packages/composer-connector-hlfv1/test/hlfwalletproxy.js b/packages/composer-connector-hlfv1/test/hlfwalletproxy.js
index 33bf427cea..97d4c9c37d 100644
--- a/packages/composer-connector-hlfv1/test/hlfwalletproxy.js
+++ b/packages/composer-connector-hlfv1/test/hlfwalletproxy.js
@@ -21,7 +21,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('HLFWalletProxy', () => {
 
@@ -77,7 +77,7 @@ describe('HLFWalletProxy', () => {
 
         it('should pass back any errors from the wallet', () => {
             mockWallet.contains.withArgs('bob1').resolves(true);
-            mockWallet.get.withArgs('bob1').rejects('ENOPERM');
+            mockWallet.get.withArgs('bob1').rejects('Error', 'ENOPERM');
             return walletProxy.getValue('member.bob1')
                 .should.be.rejectedWith(/ENOPERM/);
         });
@@ -106,7 +106,7 @@ describe('HLFWalletProxy', () => {
 
         it('should pass back any errors from the wallet', () => {
             mockWallet.contains.withArgs('bob1').resolves(true);
-            mockWallet.update.withArgs('bob1').rejects('ENOPERM');
+            mockWallet.update.withArgs('bob1').rejects('Error', 'ENOPERM');
             return walletProxy.setValue('member.bob1', 'hello world')
                 .should.be.rejectedWith(/ENOPERM/);
         });
diff --git a/packages/composer-connector-proxy/package.json b/packages/composer-connector-proxy/package.json
index 913bc22ae0..ca1816e573 100644
--- a/packages/composer-connector-proxy/package.json
+++ b/packages/composer-connector-proxy/package.json
@@ -45,12 +45,11 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
     "proxyquire": "^1.7.11",
     "serializerr": "^1.0.3",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "sinon": "^2.3.8",
     "watchify": "^3.7.0"
   },
   "dependencies": {
diff --git a/packages/composer-connector-proxy/test/proxyconnection.js b/packages/composer-connector-proxy/test/proxyconnection.js
index 9d45beca30..faef5ba7d1 100644
--- a/packages/composer-connector-proxy/test/proxyconnection.js
+++ b/packages/composer-connector-proxy/test/proxyconnection.js
@@ -24,7 +24,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('ProxyConnection', () => {
 
diff --git a/packages/composer-connector-server/package.json b/packages/composer-connector-server/package.json
index 0ace4b8525..2a495b736f 100644
--- a/packages/composer-connector-server/package.json
+++ b/packages/composer-connector-server/package.json
@@ -58,10 +58,10 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
     "proxyquire": "^1.7.11",
-    "sinon": "^1.17.7"
+    "sinon": "^2.3.8"
   },
   "nyc": {
     "exclude": [
diff --git a/packages/composer-connector-server/test/connectorserver.js b/packages/composer-connector-server/test/connectorserver.js
index 50cb02b438..8e5726c573 100644
--- a/packages/composer-connector-server/test/connectorserver.js
+++ b/packages/composer-connector-server/test/connectorserver.js
@@ -25,7 +25,7 @@ const uuid = require('uuid');
 
 const should = require('chai').should();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('ConnectorServer', () => {
 
diff --git a/packages/composer-connector-web/package.json b/packages/composer-connector-web/package.json
index bea8de03ab..156cefd4fe 100644
--- a/packages/composer-connector-web/package.json
+++ b/packages/composer-connector-web/package.json
@@ -56,9 +56,8 @@
     "karma-mocha": "^1.3.0",
     "karma-spec-reporter": "0.0.26",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "sinon": "^2.3.8",
     "watchify": "^3.7.0"
   },
   "dependencies": {
diff --git a/packages/composer-connector-web/test/webconnection.js b/packages/composer-connector-web/test/webconnection.js
index 6e1e64ec40..400eac3a14 100644
--- a/packages/composer-connector-web/test/webconnection.js
+++ b/packages/composer-connector-web/test/webconnection.js
@@ -33,7 +33,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('WebConnection', () => {
 
diff --git a/packages/composer-connector-web/test/webconnectionmanager.js b/packages/composer-connector-web/test/webconnectionmanager.js
index f76f78cc90..4f5af4fafe 100644
--- a/packages/composer-connector-web/test/webconnectionmanager.js
+++ b/packages/composer-connector-web/test/webconnectionmanager.js
@@ -25,7 +25,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('WebConnectionManager', () => {
 
diff --git a/packages/composer-cucumber-steps/package.json b/packages/composer-cucumber-steps/package.json
index 159506da06..118793deb3 100644
--- a/packages/composer-cucumber-steps/package.json
+++ b/packages/composer-cucumber-steps/package.json
@@ -32,8 +32,8 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0"
   },
   "license-check-config": {
     "src": [
diff --git a/packages/composer-playground-api/package.json b/packages/composer-playground-api/package.json
index a31be9e2bb..208327c6ea 100644
--- a/packages/composer-playground-api/package.json
+++ b/packages/composer-playground-api/package.json
@@ -50,10 +50,10 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
     "proxyquire": "^1.7.11",
-    "sinon": "^1.17.7"
+    "sinon": "^2.3.8"
   },
   "dependencies": {
     "async": "^2.5.0",
diff --git a/packages/composer-playground/package.json b/packages/composer-playground/package.json
index 45bd0733f7..8ba5dbcbac 100644
--- a/packages/composer-playground/package.json
+++ b/packages/composer-playground/package.json
@@ -174,7 +174,7 @@
     "karma-webpack": "^2.0.2",
     "left-pad": "^1.1.3",
     "lz-string": "^1.4.4",
-    "mocha": "^3.2.0",
+    "mocha": "^3.4.2",
     "ng2-bootstrap": "^1.1.16-11",
     "ng2-codemirror": "1.1.2",
     "ngx-perfect-scrollbar": "^4.3.0",
@@ -189,7 +189,7 @@
     "script-ext-html-webpack-plugin": "^1.3.5",
     "semver": "^5.3.0",
     "setimmediate": "^1.0.5",
-    "sinon": "2.1.0",
+    "sinon": "^2.3.8",
     "sinon-chai": "2.10.0",
     "source-map-loader": "^0.1.5",
     "spa-http-server": "^0.9.0",
diff --git a/packages/composer-rest-server/package.json b/packages/composer-rest-server/package.json
index 7608ab76c1..a41b18e2bf 100644
--- a/packages/composer-rest-server/package.json
+++ b/packages/composer-rest-server/package.json
@@ -70,12 +70,11 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
     "passport-github2": "^0.1.10",
     "proxyquire": "^1.7.11",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "sinon": "^2.3.8",
     "sleep-promise": "^2.0.0"
   },
   "license-check-config": {
diff --git a/packages/composer-rest-server/test/cli.js b/packages/composer-rest-server/test/cli.js
index b3c9679dcb..ac5c6c52cc 100644
--- a/packages/composer-rest-server/test/cli.js
+++ b/packages/composer-rest-server/test/cli.js
@@ -19,7 +19,7 @@ const Util = require('../lib/util');
 require('chai').should();
 const proxyquire =  require('proxyquire').noPreserveCache();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('composer-rest-server CLI unit tests', () => {
 
diff --git a/packages/composer-rest-server/test/lib/util.js b/packages/composer-rest-server/test/lib/util.js
index 2f85389f6d..e39eb22af9 100644
--- a/packages/composer-rest-server/test/lib/util.js
+++ b/packages/composer-rest-server/test/lib/util.js
@@ -19,7 +19,7 @@ const Util = require('../../lib/util');
 
 require('chai').should();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Util', () => {
 
diff --git a/packages/composer-rest-server/test/server/boot/composer-discovery.js b/packages/composer-rest-server/test/server/boot/composer-discovery.js
index 3e3f0620b3..bb428e127a 100644
--- a/packages/composer-rest-server/test/server/boot/composer-discovery.js
+++ b/packages/composer-rest-server/test/server/boot/composer-discovery.js
@@ -26,7 +26,7 @@ const path = require('path');
 
 require('chai').should();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 const bfs_fs = BrowserFS.BFSRequire('fs');
 
diff --git a/packages/composer-rest-server/test/server/boot/composer-runtime.js b/packages/composer-rest-server/test/server/boot/composer-runtime.js
index bbbc9f6986..19d924b9ca 100644
--- a/packages/composer-rest-server/test/server/boot/composer-runtime.js
+++ b/packages/composer-rest-server/test/server/boot/composer-runtime.js
@@ -23,7 +23,7 @@ const path = require('path');
 
 require('chai').should();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('composer-runtime boot script', () => {
 
diff --git a/packages/composer-rest-server/test/server/servercmd.js b/packages/composer-rest-server/test/server/servercmd.js
index 8c8250ee69..ff9a2ba666 100644
--- a/packages/composer-rest-server/test/server/servercmd.js
+++ b/packages/composer-rest-server/test/server/servercmd.js
@@ -19,7 +19,7 @@
 require('chai').should();
 const proxyquire =  require('proxyquire').noPreserveCache();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('servercmd', () => {
 
diff --git a/packages/composer-runtime-embedded/package.json b/packages/composer-runtime-embedded/package.json
index c55151a02d..ab1cb83258 100644
--- a/packages/composer-runtime-embedded/package.json
+++ b/packages/composer-runtime-embedded/package.json
@@ -33,10 +33,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8",
     "watchify": "^3.7.0"
   },
   "license-check-config": {
diff --git a/packages/composer-runtime-embedded/test/embeddedeventservice.js b/packages/composer-runtime-embedded/test/embeddedeventservice.js
index 52f81197a5..60ad7e16e1 100644
--- a/packages/composer-runtime-embedded/test/embeddedeventservice.js
+++ b/packages/composer-runtime-embedded/test/embeddedeventservice.js
@@ -21,7 +21,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EmbeddedEventService', () => {
 
diff --git a/packages/composer-runtime-embedded/test/embeddedhttpservice.js b/packages/composer-runtime-embedded/test/embeddedhttpservice.js
index c8ccd1b62d..3db5afd948 100644
--- a/packages/composer-runtime-embedded/test/embeddedhttpservice.js
+++ b/packages/composer-runtime-embedded/test/embeddedhttpservice.js
@@ -19,7 +19,7 @@ const EmbeddedHTTPService = require('..').EmbeddedHTTPService;
 const request = require('request');
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 require('chai-as-promised');
 chai.should();
 const expect = chai.expect;
diff --git a/packages/composer-runtime-pouchdb/package.json b/packages/composer-runtime-pouchdb/package.json
index 758bf8a7a5..52a865afdd 100644
--- a/packages/composer-runtime-pouchdb/package.json
+++ b/packages/composer-runtime-pouchdb/package.json
@@ -33,10 +33,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8",
     "watchify": "^3.7.0"
   },
   "license-check-config": {
diff --git a/packages/composer-runtime-pouchdb/test/pouchdbdatacollection.js b/packages/composer-runtime-pouchdb/test/pouchdbdatacollection.js
index fda8c5f804..a5feca1a12 100644
--- a/packages/composer-runtime-pouchdb/test/pouchdbdatacollection.js
+++ b/packages/composer-runtime-pouchdb/test/pouchdbdatacollection.js
@@ -24,7 +24,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 // Install the PouchDB plugins.
 PouchDB.plugin(require('pouchdb-adapter-memory'));
diff --git a/packages/composer-runtime-pouchdb/test/pouchdbdataservice.js b/packages/composer-runtime-pouchdb/test/pouchdbdataservice.js
index bdf117af1a..5eea16a01a 100644
--- a/packages/composer-runtime-pouchdb/test/pouchdbdataservice.js
+++ b/packages/composer-runtime-pouchdb/test/pouchdbdataservice.js
@@ -24,7 +24,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 // Install the PouchDB plugins.
 PouchDB.plugin(require('pouchdb-adapter-memory'));
diff --git a/packages/composer-runtime-web/package.json b/packages/composer-runtime-web/package.json
index b35496a4d1..2f93f3c40b 100644
--- a/packages/composer-runtime-web/package.json
+++ b/packages/composer-runtime-web/package.json
@@ -44,9 +44,8 @@
     "karma-mocha": "^1.3.0",
     "karma-spec-reporter": "0.0.26",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "sinon": "^2.3.8",
     "watchify": "^3.7.0"
   },
   "license-check-config": {
diff --git a/packages/composer-runtime-web/test/webdataservice.js b/packages/composer-runtime-web/test/webdataservice.js
index 7069de42d8..c97022faf8 100644
--- a/packages/composer-runtime-web/test/webdataservice.js
+++ b/packages/composer-runtime-web/test/webdataservice.js
@@ -24,7 +24,6 @@ describe('WebDataService', () => {
     let dataService;
 
     beforeEach(() => {
-        dataService = new WebDataService('3a4b69c9-239c-4e3d-9c33-9c24d2bdbb1c');
     });
 
     afterEach(() => {
diff --git a/packages/composer-runtime-web/test/webeventservice.js b/packages/composer-runtime-web/test/webeventservice.js
index 342e563e37..83d131a84e 100644
--- a/packages/composer-runtime-web/test/webeventservice.js
+++ b/packages/composer-runtime-web/test/webeventservice.js
@@ -21,7 +21,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('WebEventService', () => {
 
diff --git a/packages/composer-runtime-web/test/webhttpservice.js b/packages/composer-runtime-web/test/webhttpservice.js
index f6dc382f8a..19b75496a4 100644
--- a/packages/composer-runtime-web/test/webhttpservice.js
+++ b/packages/composer-runtime-web/test/webhttpservice.js
@@ -18,10 +18,9 @@ const WebHTTPService = require('..').WebHTTPService;
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 require('chai-as-promised');
 chai.should();
-//const expect = chai.expect;
 const xhr = require('xhr');
 
 /**
@@ -99,4 +98,4 @@ describe('WebHTTPService', () => {
                 });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/packages/composer-runtime/package.json b/packages/composer-runtime/package.json
index 971b93bc52..42fa95fd7d 100644
--- a/packages/composer-runtime/package.json
+++ b/packages/composer-runtime/package.json
@@ -43,10 +43,9 @@
     "fs-extra": "^1.0.0",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8",
     "uglifyify": "^3.0.4"
   },
   "license-check-config": {
diff --git a/packages/composer-runtime/test/accesscontroller.js b/packages/composer-runtime/test/accesscontroller.js
index ea7f26f65e..b04ddd0f22 100644
--- a/packages/composer-runtime/test/accesscontroller.js
+++ b/packages/composer-runtime/test/accesscontroller.js
@@ -28,7 +28,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('AccessController', () => {
 
diff --git a/packages/composer-runtime/test/api.js b/packages/composer-runtime/test/api.js
index c0d54078f2..a7e25ce92d 100644
--- a/packages/composer-runtime/test/api.js
+++ b/packages/composer-runtime/test/api.js
@@ -37,7 +37,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Api', () => {
 
diff --git a/packages/composer-runtime/test/api/assetregistry.js b/packages/composer-runtime/test/api/assetregistry.js
index 28d14117d0..8cd4ec6ff1 100644
--- a/packages/composer-runtime/test/api/assetregistry.js
+++ b/packages/composer-runtime/test/api/assetregistry.js
@@ -23,7 +23,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('AssetRegistry', () => {
 
diff --git a/packages/composer-runtime/test/api/factory.js b/packages/composer-runtime/test/api/factory.js
index 87129641f3..7b39d5352b 100644
--- a/packages/composer-runtime/test/api/factory.js
+++ b/packages/composer-runtime/test/api/factory.js
@@ -25,7 +25,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Factory', () => {
 
diff --git a/packages/composer-runtime/test/api/participantregistry.js b/packages/composer-runtime/test/api/participantregistry.js
index b0bf3db704..9205940564 100644
--- a/packages/composer-runtime/test/api/participantregistry.js
+++ b/packages/composer-runtime/test/api/participantregistry.js
@@ -23,7 +23,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('ParticipantRegistry', () => {
 
diff --git a/packages/composer-runtime/test/api/serializer.js b/packages/composer-runtime/test/api/serializer.js
index 59162fe934..c033c1d209 100644
--- a/packages/composer-runtime/test/api/serializer.js
+++ b/packages/composer-runtime/test/api/serializer.js
@@ -23,7 +23,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Serializer', () => {
 
diff --git a/packages/composer-runtime/test/compiledaclbundle.js b/packages/composer-runtime/test/compiledaclbundle.js
index 6842e70274..bb0d8c811a 100644
--- a/packages/composer-runtime/test/compiledaclbundle.js
+++ b/packages/composer-runtime/test/compiledaclbundle.js
@@ -21,7 +21,7 @@ const Resource = require('composer-common').Resource;
 
 require('chai').should();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('CompiledAclBundle', () => {
 
diff --git a/packages/composer-runtime/test/compiledquerybundle.js b/packages/composer-runtime/test/compiledquerybundle.js
index a73db5701a..2c1180c1fc 100644
--- a/packages/composer-runtime/test/compiledquerybundle.js
+++ b/packages/composer-runtime/test/compiledquerybundle.js
@@ -22,7 +22,7 @@ const QueryManager = require('composer-common').QueryManager;
 
 require('chai').should();
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('CompiledQueryBundle', () => {
 
diff --git a/packages/composer-runtime/test/compiledscriptbundle.js b/packages/composer-runtime/test/compiledscriptbundle.js
index 9e4118aacd..4739fcce36 100644
--- a/packages/composer-runtime/test/compiledscriptbundle.js
+++ b/packages/composer-runtime/test/compiledscriptbundle.js
@@ -24,7 +24,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('CompiledScriptBundle', () => {
 
diff --git a/packages/composer-runtime/test/context.js b/packages/composer-runtime/test/context.js
index 8475382264..aa6f9b7fa5 100644
--- a/packages/composer-runtime/test/context.js
+++ b/packages/composer-runtime/test/context.js
@@ -47,7 +47,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Context', () => {
 
diff --git a/packages/composer-runtime/test/dataservice.js b/packages/composer-runtime/test/dataservice.js
index facbb399af..a08ab79648 100644
--- a/packages/composer-runtime/test/dataservice.js
+++ b/packages/composer-runtime/test/dataservice.js
@@ -21,7 +21,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('DataService', () => {
 
diff --git a/packages/composer-runtime/test/engine.businessnetworks.js b/packages/composer-runtime/test/engine.businessnetworks.js
index 77169a1b0f..7ccf2d4b05 100644
--- a/packages/composer-runtime/test/engine.businessnetworks.js
+++ b/packages/composer-runtime/test/engine.businessnetworks.js
@@ -37,7 +37,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EngineBusinessNetworks', () => {
 
diff --git a/packages/composer-runtime/test/engine.js b/packages/composer-runtime/test/engine.js
index c265d36c34..a1456f9f92 100644
--- a/packages/composer-runtime/test/engine.js
+++ b/packages/composer-runtime/test/engine.js
@@ -37,7 +37,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 const LOG = Logger.getLog('Engine');
 
diff --git a/packages/composer-runtime/test/engine.logging.js b/packages/composer-runtime/test/engine.logging.js
index 6e9106270a..4e6f904f8f 100644
--- a/packages/composer-runtime/test/engine.logging.js
+++ b/packages/composer-runtime/test/engine.logging.js
@@ -24,7 +24,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EngineIdentities', () => {
 
diff --git a/packages/composer-runtime/test/engine.queries.js b/packages/composer-runtime/test/engine.queries.js
index 1b330a94aa..f816364b27 100644
--- a/packages/composer-runtime/test/engine.queries.js
+++ b/packages/composer-runtime/test/engine.queries.js
@@ -28,7 +28,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EngineQueries', () => {
 
diff --git a/packages/composer-runtime/test/engine.registries.js b/packages/composer-runtime/test/engine.registries.js
index 227aa3ba05..1acaa11c3c 100644
--- a/packages/composer-runtime/test/engine.registries.js
+++ b/packages/composer-runtime/test/engine.registries.js
@@ -25,7 +25,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EngineRegistries', () => {
 
diff --git a/packages/composer-runtime/test/engine.resources.js b/packages/composer-runtime/test/engine.resources.js
index 819d6e3693..66d2d7a68b 100644
--- a/packages/composer-runtime/test/engine.resources.js
+++ b/packages/composer-runtime/test/engine.resources.js
@@ -30,7 +30,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EngineResources', () => {
 
diff --git a/packages/composer-runtime/test/engine.transactions.js b/packages/composer-runtime/test/engine.transactions.js
index db30eecfb8..849201e505 100644
--- a/packages/composer-runtime/test/engine.transactions.js
+++ b/packages/composer-runtime/test/engine.transactions.js
@@ -33,7 +33,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EngineTransactions', () => {
 
diff --git a/packages/composer-runtime/test/httpservice.js b/packages/composer-runtime/test/httpservice.js
index 2e86e4cf1a..fa7dac0bb4 100644
--- a/packages/composer-runtime/test/httpservice.js
+++ b/packages/composer-runtime/test/httpservice.js
@@ -20,7 +20,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
-require('sinon-as-promised');
+
 const expect = chai.expect;
 
 describe('HTTPService', () => {
diff --git a/packages/composer-runtime/test/identitymanager.js b/packages/composer-runtime/test/identitymanager.js
index ec6f1e1088..1d7ff57a50 100644
--- a/packages/composer-runtime/test/identitymanager.js
+++ b/packages/composer-runtime/test/identitymanager.js
@@ -29,7 +29,7 @@ chai.use(require('chai-as-promised'));
 chai.use(require('chai-subset'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('IdentityManager', () => {
 
diff --git a/packages/composer-runtime/test/queryexecutor.js b/packages/composer-runtime/test/queryexecutor.js
index b11a9d7ac0..a5f4f66a7c 100644
--- a/packages/composer-runtime/test/queryexecutor.js
+++ b/packages/composer-runtime/test/queryexecutor.js
@@ -24,7 +24,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 let matchRelationship = function (fqi) {
     return sinon.match((value) => {
diff --git a/packages/composer-runtime/test/registry.js b/packages/composer-runtime/test/registry.js
index 2b6d1416a3..412f298129 100644
--- a/packages/composer-runtime/test/registry.js
+++ b/packages/composer-runtime/test/registry.js
@@ -27,7 +27,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Registry', () => {
 
diff --git a/packages/composer-runtime/test/registrymanager.js b/packages/composer-runtime/test/registrymanager.js
index 0a2320de53..b92b791ccf 100644
--- a/packages/composer-runtime/test/registrymanager.js
+++ b/packages/composer-runtime/test/registrymanager.js
@@ -31,7 +31,7 @@ chai.use(require('chai-as-promised'));
 chai.use(require('chai-subset'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('RegistryManager', () => {
 
diff --git a/packages/composer-runtime/test/resolver.js b/packages/composer-runtime/test/resolver.js
index ab9ac7da69..7c09ec27f0 100644
--- a/packages/composer-runtime/test/resolver.js
+++ b/packages/composer-runtime/test/resolver.js
@@ -26,7 +26,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Resolver', () => {
 
diff --git a/packages/composer-runtime/test/transactionhandler.js b/packages/composer-runtime/test/transactionhandler.js
index d24b81aeaf..c5ac697a8e 100644
--- a/packages/composer-runtime/test/transactionhandler.js
+++ b/packages/composer-runtime/test/transactionhandler.js
@@ -22,7 +22,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('TransactionHandler', () => {
 
diff --git a/packages/composer-systests/package.json b/packages/composer-systests/package.json
index 4cb15843ec..6bdf6c8d8d 100644
--- a/packages/composer-systests/package.json
+++ b/packages/composer-systests/package.json
@@ -58,7 +58,7 @@
     "karma-spec-reporter": "0.0.26",
     "license-check": "^1.1.5",
     "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
+    "mocha": "^3.4.2",
     "sleep-promise": "^2.0.0",
     "socket.io": "^1.7.3",
     "uuid": "^3.0.1",
diff --git a/packages/loopback-connector-composer/package.json b/packages/loopback-connector-composer/package.json
index dff9423e95..12c2a8df2f 100644
--- a/packages/loopback-connector-composer/package.json
+++ b/packages/loopback-connector-composer/package.json
@@ -41,10 +41,9 @@
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
     "loopback": "^2.35.0",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8",
     "sleep-promise": "^2.0.0"
   },
   "license-check-config": {
diff --git a/packages/loopback-connector-composer/test/businessnetworkconnectionwrapper.js b/packages/loopback-connector-composer/test/businessnetworkconnectionwrapper.js
index 6141a22cd9..18a29cf022 100644
--- a/packages/loopback-connector-composer/test/businessnetworkconnectionwrapper.js
+++ b/packages/loopback-connector-composer/test/businessnetworkconnectionwrapper.js
@@ -26,7 +26,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('BusinessNetworkConnectionWrapper', () => {
 
diff --git a/packages/loopback-connector-composer/test/businessnetworkconnector.js b/packages/loopback-connector-composer/test/businessnetworkconnector.js
index 1567d656b0..3371538fe9 100644
--- a/packages/loopback-connector-composer/test/businessnetworkconnector.js
+++ b/packages/loopback-connector-composer/test/businessnetworkconnector.js
@@ -37,7 +37,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('BusinessNetworkConnector', () => {