diff --git a/packages/animaltracking-network/package.json b/packages/animaltracking-network/package.json
index a86d9f1..3649462 100644
--- a/packages/animaltracking-network/package.json
+++ b/packages/animaltracking-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "animaltracking-network",
   "version": "0.2.2",
@@ -35,11 +35,11 @@
   ],
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "jsdoc": "^3.5.5",
     "license-check": "^1.1.5",
diff --git a/packages/animaltracking-network/test/mozart.cto.js b/packages/animaltracking-network/test/mozart.cto.js
index 516a794..7eb33f1 100644
--- a/packages/animaltracking-network/test/mozart.cto.js
+++ b/packages/animaltracking-network/test/mozart.cto.js
@@ -16,11 +16,8 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
-
 const Util = require('./util');
 
 const namespace = 'com.biz';
@@ -41,11 +38,8 @@ describe('Animal Tracking Network', function() {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/basic-sample-network/package.json b/packages/basic-sample-network/package.json
index 775fc8f..ca14505 100644
--- a/packages/basic-sample-network/package.json
+++ b/packages/basic-sample-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "basic-sample-network",
   "version": "0.2.2",
@@ -33,11 +33,11 @@
   "devDependencies": {
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
-    "composer-cucumber-steps": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
+    "composer-cucumber-steps": "^0.18.0-0",
     "cucumber": "^2.2.0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
diff --git a/packages/basic-sample-network/test/sample.js b/packages/basic-sample-network/test/sample.js
index b6e1275..e2d8894 100644
--- a/packages/basic-sample-network/test/sample.js
+++ b/packages/basic-sample-network/test/sample.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 const chai = require('chai');
@@ -57,11 +55,8 @@ describe('Sample', () => {
     let businessNetworkName;
 
     before(async () => {
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // Identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/bond-network/package.json b/packages/bond-network/package.json
index 06def15..e2a5a1b 100644
--- a/packages/bond-network/package.json
+++ b/packages/bond-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "bond-network",
   "version": "0.2.2",
@@ -33,11 +33,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/bond-network/test/Bond.js b/packages/bond-network/test/Bond.js
index 05f1c2f..5b9d8c7 100644
--- a/packages/bond-network/test/Bond.js
+++ b/packages/bond-network/test/Bond.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -37,11 +35,8 @@ describe('Publish Bond', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/carauction-network/package.json b/packages/carauction-network/package.json
index 2b88f2e..7ef057c 100644
--- a/packages/carauction-network/package.json
+++ b/packages/carauction-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "carauction-network",
   "version": "0.2.2",
@@ -32,11 +32,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/carauction-network/test/CarAuction.js b/packages/carauction-network/test/CarAuction.js
index b642828..a973831 100644
--- a/packages/carauction-network/test/CarAuction.js
+++ b/packages/carauction-network/test/CarAuction.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -37,11 +35,8 @@ describe('CarAuction', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/digitalproperty-network/package.json b/packages/digitalproperty-network/package.json
index 3649674..777a701 100644
--- a/packages/digitalproperty-network/package.json
+++ b/packages/digitalproperty-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "digitalproperty-network",
   "version": "0.2.2",
@@ -31,11 +31,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/digitalproperty-network/test/DigitalLandTitle.js b/packages/digitalproperty-network/test/DigitalLandTitle.js
index 18a32ad..31efac7 100644
--- a/packages/digitalproperty-network/test/DigitalLandTitle.js
+++ b/packages/digitalproperty-network/test/DigitalLandTitle.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -35,11 +33,8 @@ describe('DigitalLandTitle', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/marbles-network/package.json b/packages/marbles-network/package.json
index 43196ca..da72168 100644
--- a/packages/marbles-network/package.json
+++ b/packages/marbles-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "marbles-network",
   "version": "0.2.2",
@@ -32,11 +32,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/marbles-network/test/MarblesTests.js b/packages/marbles-network/test/MarblesTests.js
index 88bf0e6..7aa9261 100644
--- a/packages/marbles-network/test/MarblesTests.js
+++ b/packages/marbles-network/test/MarblesTests.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -37,11 +35,8 @@ describe('Marbles', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/perishable-network/package.json b/packages/perishable-network/package.json
index 2334347..7acfcdf 100644
--- a/packages/perishable-network/package.json
+++ b/packages/perishable-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "perishable-network",
   "version": "0.2.2",
@@ -33,11 +33,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/perishable-network/test/perishable.js b/packages/perishable-network/test/perishable.js
index bcca6ce..15eab63 100644
--- a/packages/perishable-network/test/perishable.js
+++ b/packages/perishable-network/test/perishable.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -42,11 +40,8 @@ describe('Perishable Shipping Network', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/pii-network/package.json b/packages/pii-network/package.json
index 32d012c..33b9042 100644
--- a/packages/pii-network/package.json
+++ b/packages/pii-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "pii-network",
   "version": "0.2.2",
@@ -32,11 +32,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/pii-network/test/pii.js b/packages/pii-network/test/pii.js
index b3b0836..660ccc8 100644
--- a/packages/pii-network/test/pii.js
+++ b/packages/pii-network/test/pii.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -55,11 +53,8 @@ describe('Acl checking', () => {
     let factory;
 
     before(async () => {
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // Identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/trade-network/package.json b/packages/trade-network/package.json
index 659e743..d78e0e5 100644
--- a/packages/trade-network/package.json
+++ b/packages/trade-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "trade-network",
   "version": "0.2.2",
@@ -32,11 +32,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/trade-network/test/trading.js b/packages/trade-network/test/trading.js
index 9160a33..190554e 100644
--- a/packages/trade-network/test/trading.js
+++ b/packages/trade-network/test/trading.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -37,11 +35,8 @@ describe('Commodity Trading', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {
diff --git a/packages/vehicle-lifecycle-network/package.json b/packages/vehicle-lifecycle-network/package.json
index 597ea4c..34e94ae 100644
--- a/packages/vehicle-lifecycle-network/package.json
+++ b/packages/vehicle-lifecycle-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "vehicle-lifecycle-network",
   "version": "0.2.2",
@@ -35,11 +35,11 @@
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "composer-admin": "^0.17.0-0",
-    "composer-cli": "^0.17.0-0",
-    "composer-client": "^0.17.0-0",
-    "composer-common": "^0.17.0-0",
-    "composer-connector-embedded": "^0.17.0-0",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
diff --git a/packages/vehicle-lifecycle-network/test/util.js b/packages/vehicle-lifecycle-network/test/util.js
index 799dd8d..ceafa9c 100644
--- a/packages/vehicle-lifecycle-network/test/util.js
+++ b/packages/vehicle-lifecycle-network/test/util.js
@@ -16,10 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
-
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 const NS = 'org.acme.vehicle.lifecycle';
@@ -119,10 +116,7 @@ async function getAdminConnection() {
         name: 'embedded',
         'x-type': 'embedded'
     };
-    const credentials = {
-        certificate: 'FAKE CERTIFICATE',
-        privateKey: 'FAKE PRIVATE KEY'
-    };
+    const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
     const deployerMetadata = {
         version: 1,
diff --git a/packages/vehicle-manufacture-network/package.json b/packages/vehicle-manufacture-network/package.json
index e779a3b..63fb470 100644
--- a/packages/vehicle-manufacture-network/package.json
+++ b/packages/vehicle-manufacture-network/package.json
@@ -1,6 +1,6 @@
 {
 	"engines": {
-		"composer": "^0.17.0"
+		"composer": "^0.18.0"
 	},
 	"name": "vehicle-manufacture-network",
 	"description": "Vehicle manufacture network",
@@ -33,10 +33,10 @@
 		"browserfs": "^1.2.0",
 		"chai": "^3.5.0",
 		"chai-as-promised": "^6.0.0",
-		"composer-admin": "^0.17.0-0",
-		"composer-cli": "^0.17.0-0",
-		"composer-client": "^0.17.0-0",
-		"composer-connector-embedded": "^0.17.0-0",
+		"composer-admin": "^0.18.0-0",
+		"composer-cli": "^0.18.0-0",
+		"composer-client": "^0.18.0-0",
+		"composer-connector-embedded": "^0.18.0-0",
 		"eslint": "^3.6.1",
 		"istanbul": "^0.4.5",
 		"jsdoc": "^3.4.1",
diff --git a/packages/vehicle-manufacture-network/test/script.js b/packages/vehicle-manufacture-network/test/script.js
index b58b21b..3cb5455 100644
--- a/packages/vehicle-manufacture-network/test/script.js
+++ b/packages/vehicle-manufacture-network/test/script.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 const chai = require('chai');
@@ -41,11 +39,8 @@ describe('Manufacture network', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {