diff --git a/src/OrbitDB.js b/src/OrbitDB.js
index b544ce7..17ca5fa 100644
--- a/src/OrbitDB.js
+++ b/src/OrbitDB.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const EventEmitter  = require('events').EventEmitter;
-const Logger       = require('logplease');
-const logger       = Logger.create("orbit-db", { color: Logger.Colors.Magenta });
+const Logger        = require('logplease');
+const logger        = Logger.create("orbit-db", { color: Logger.Colors.Magenta });
 const EventStore    = require('orbit-db-eventstore');
 const FeedStore     = require('orbit-db-feedstore');
 const KeyValueStore = require('orbit-db-kvstore');
@@ -111,17 +111,20 @@ class OrbitDB {
 
     const readNetworkInfo = (hash) => {
       return new Promise((resolve, reject) => {
-        // this._ipfs.cat(hash).then((res) => {
-        //   let buf = '';
-        //   res
-        //     .on('error', (err) => reject(err))
-        //     .on('data', (data) => buf += data)
-        //     .on('end', () => resolve(buf))
-        // }).catch((e) => reject(e));
-        resolve(JSON.stringify({
-          name: 'localhost dev network',
-          publishers: ['localhost:3333']
-        }))
+        this._ipfs.files.cat(hash, (err, res) => {
+          if(err) return reject(e)
+          let buf = '';
+          res.on('data', (res) => {
+            res.stream
+              .on('error', (err) => reject(err))
+              .on('data', (data) => buf += data)
+              .on('end', () => resolve(buf.toString()))
+            })
+        });
+        // resolve(JSON.stringify({
+        //   name: 'localhost dev network',
+        //   publishers: ['localhost:3333']
+        // }))
       });
     };
 
diff --git a/test/client.test.js b/test/client.test.js
index e2c7d66..1a45f65 100644
--- a/test/client.test.js
+++ b/test/client.test.js
@@ -21,41 +21,42 @@ const password = '';
 
 let ipfs, ipfsDaemon;
 const IpfsApis = [
-// {
-//   // js-ipfs
-//   start: () => {
-//     return new Promise((resolve, reject) => {
-//       const IPFS = require('ipfs')
-//       const ipfs = new IPFS();
-//       ipfs.goOnline((err) => {
-//         if(err) reject(err)
-//         else resolve(ipfs)
-//       });
-//     });
-//   },
-//   stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
-// },
 {
-  // js-ipfs-api via local daemon
+  // js-ipfs
   start: () => {
     return new Promise((resolve, reject) => {
-      ipfsd.disposableApi((err, ipfs) => {
-        if(err) console.error(err);
-        resolve(ipfs);
+      const IPFS = require('ipfs')
+      const ipfs = new IPFS();
+      ipfs.goOnline((err) => {
+        if(err) reject(err)
+        resolve(ipfs)
       });
-      // ipfsd.local((err, node) => {
-      //   if(err) reject(err);
-      //   ipfsDaemon = node;
-      //   ipfsDaemon.startDaemon((err, ipfs) => {
-      //     if(err) reject(err);
-      //     resolve(ipfs);
-      //   });
-      // });
     });
   },
-  stop: () => Promise.resolve()
-  // stop: () => new Promise((resolve, reject) => ipfsDaemon.stopDaemon(resolve))
-}
+  // stop: () => Promise.resolve()
+  stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
+},
+// {
+//   // js-ipfs-api via local daemon
+//   start: () => {
+//     return new Promise((resolve, reject) => {
+//       ipfsd.disposableApi((err, ipfs) => {
+//         if(err) console.error(err);
+//         resolve(ipfs);
+//       });
+//       // ipfsd.local((err, node) => {
+//       //   if(err) reject(err);
+//       //   ipfsDaemon = node;
+//       //   ipfsDaemon.startDaemon((err, ipfs) => {
+//       //     if(err) reject(err);
+//       //     resolve(ipfs);
+//       //   });
+//       // });
+//     });
+//   },
+//   stop: () => Promise.resolve()
+//   // stop: () => new Promise((resolve, reject) => ipfsDaemon.stopDaemon(resolve))
+// }
 ];
 
 OrbitServer.start();
diff --git a/test/counterdb.test.js b/test/counterdb.test.js
index f55ee5c..8c6ef98 100644
--- a/test/counterdb.test.js
+++ b/test/counterdb.test.js
@@ -20,38 +20,39 @@ const ipfsPath  = '/tmp/orbittests';
 
 let ipfs, ipfsDaemon;
 const IpfsApis = [
-// {
-//   // js-ipfs
-//   start: () => {
-//     return new Promise((resolve, reject) => {
-//       const IPFS = require('ipfs')
-//       const ipfs = new IPFS();
-//       ipfs.goOnline(() => resolve(ipfs));
-//     });
-//   },
-//   stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
-// },
 {
-  // js-ipfs-api via local daemon
+  // js-ipfs
   start: () => {
     return new Promise((resolve, reject) => {
-      ipfsd.disposableApi((err, ipfs) => {
-        if(err) console.error(err);
-        resolve(ipfs);
-      });
-      // ipfsd.local((err, node) => {
-      //   if(err) reject(err);
-      //   ipfsDaemon = node;
-      //   ipfsDaemon.startDaemon((err, ipfs) => {
-      //     if(err) reject(err);
-      //     resolve(ipfs);
-      //   });
-      // });
+      const IPFS = require('ipfs')
+      const ipfs = new IPFS();
+      ipfs.goOnline(() => resolve(ipfs));
+      // resolve(ipfs);
     });
   },
-  stop: () => Promise.resolve()
-  // stop: () => new Promise((resolve, reject) => ipfsDaemon.stopDaemon(resolve))
-}
+  stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
+},
+// {
+//   // js-ipfs-api via local daemon
+//   start: () => {
+//     return new Promise((resolve, reject) => {
+//       ipfsd.disposableApi((err, ipfs) => {
+//         if(err) console.error(err);
+//         resolve(ipfs);
+//       });
+//       // ipfsd.local((err, node) => {
+//       //   if(err) reject(err);
+//       //   ipfsDaemon = node;
+//       //   ipfsDaemon.startDaemon((err, ipfs) => {
+//       //     if(err) reject(err);
+//       //     resolve(ipfs);
+//       //   });
+//       // });
+//     });
+//   },
+//   stop: () => Promise.resolve()
+//   // stop: () => new Promise((resolve, reject) => ipfsDaemon.stopDaemon(resolve))
+// }
 ];
 
 // OrbitServer.start(); // uncomment if running this test suite stand-alone