diff --git a/test/client.test.js b/test/client.test.js
index 1eef899..9729578 100644
--- a/test/client.test.js
+++ b/test/client.test.js
@@ -23,22 +23,24 @@ let ipfs, ipfsDaemon;
 const IpfsApis = [
 {
   // js-ipfs
+  name: 'js-ipfs',
   start: () => {
     return new Promise((resolve, reject) => {
       const IPFS = require('ipfs')
       const ipfs = new IPFS('/tmp/orbitdbtest');
-      // resolve(ipfs);
-      ipfs.goOnline((err) => {
-        if(err) reject(err)
-        resolve(ipfs)
-      });
+      resolve(ipfs);
+      // ipfs.goOnline((err) => {
+      //   if(err) reject(err)
+      //   resolve(ipfs)
+      // });
     });
   },
-  // stop: () => Promise.resolve()
-  stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
+  stop: () => Promise.resolve()
+  // stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
 },
 {
   // js-ipfs-api via local daemon
+  name: 'js-ipfs-api',
   start: () => {
     return new Promise((resolve, reject) => {
       ipfsd.disposableApi((err, ipfs) => {
@@ -64,7 +66,7 @@ OrbitServer.start();
 
 IpfsApis.forEach(function(ipfsApi) {
 
-  describe('Orbit Client', function() {
+  describe('Orbit Client with ' + ipfsApi.name, function() {
     this.timeout(40000);
 
     let client, client2, db;
diff --git a/test/counterdb.test.js b/test/counterdb.test.js
index d83531c..5fcdc6b 100644
--- a/test/counterdb.test.js
+++ b/test/counterdb.test.js
@@ -25,16 +25,36 @@ const IpfsApis = [
   start: () => {
     return new Promise((resolve, reject) => {
       const IPFS = require('ipfs')
-      const ipfs = new IPFS();
+      const ipfs = new IPFS('/tmp/orbit-db-test');
+      const init = () => {
+        return new Promise((resolve, reject) => {
+          ipfs.init({}, (err) => {
+            console.log("1")
+            if (err) {
+              if (err.message === 'repo already exists') {
+                console.log("2", err)
+                return resolve();
+              }
+              return reject(err);
+            }
+            resolve();
+          });
+        });
+      };
+
       // resolve(ipfs);
-      ipfs.goOnline((err) => {
-        if(err) reject(err)
-        resolve(ipfs)
+      return init().then(() => {
+        resolve(ipfs);
+        // ipfs.goOnline((err) => {
+        //   console.log("ava")
+        //   if(err) reject(err)
+        //   return resolve(ipfs)
+        // });
       });
     });
   },
-  // stop: () => Promise.resolve()
-  stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
+  stop: () => Promise.resolve()
+  // stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
 },
 {
   // js-ipfs-api via local daemon