diff --git a/package.json b/package.json
index c9842aba9c..fd75e69c0e 100644
--- a/package.json
+++ b/package.json
@@ -8,13 +8,15 @@
   "main": "src/index.js",
   "scripts": {
     "lint": "standard",
-    "coverage": "istanbul cover --print both -- _mocha tests/test-*/index.js",
+    "coverage": "istanbul cover --print both -- _mocha tests/test-core/index.js",
     "test": "npm run test:node && npm run test:browser",
-    "test:node": "mocha tests/test-*/index.js",
+    "test:node": "npm run test:node:core && npm run test:node:http-api && npm run test:node:cli",
+    "test:node:cli": "mocha tests/test-cli/index.js",
+    "test:node:core": "mocha tests/test-core/index.js",
+    "test:node:http-api": "mocha tests/test-http-api/index.js",
     "test:browser": "karma start karma.conf.js",
     "test:core": "mocha tests/test-core/index.js",
-    "test:cli": "mocha tests/test-cli/index.js",
-    "test:cli-offline": "mocha tests/test-cli-offline/index.js"
+    "test:cli": "mocha tests/test-cli/index.js"
   },
   "pre-commit": [
     "lint",
@@ -67,9 +69,11 @@
     "bs58": "^3.0.0",
     "debug": "^2.2.0",
     "hapi": "^12.0.0",
+    "ipfs-api": "^2.13.1",
     "ipfs-blocks": "^0.1.0",
     "ipfs-merkle-dag": "^0.2.1",
     "ipfs-repo": "^0.5.0",
+    "joi": "^8.0.2",
     "lodash.get": "^4.0.0",
     "lodash.set": "^4.0.0",
     "peer-id": "^0.5.0",
diff --git a/src/cli/commands/daemon.js b/src/cli/commands/daemon.js
index f4ab32e09c..4ee301a7d7 100644
--- a/src/cli/commands/daemon.js
+++ b/src/cli/commands/daemon.js
@@ -4,15 +4,28 @@ const Command = require('ronin').Command
 const httpAPI = require('../../http-api')
 const debug = require('debug')
 const log = debug('cli:daemon')
-log.error = debug('cli:damon:error')
+log.error = debug('cli:daemon:error')
 
 module.exports = Command.extend({
   desc: 'Start a long-running daemon process',
 
   run: name => {
+    console.log('Initializing daemon...')
     httpAPI.start((err) => {
-      if (err) { return log.error(err) }
-      log('daemon started')
+      if (err) {
+        return log.error(err)
+      }
+      console.log('Daemon is ready')
+    })
+
+    process.on('SIGINT', () => {
+      console.log('Received interrupt signal, shutting down..')
+      httpAPI.stop((err) => {
+        if (err) {
+          return log.error(err)
+        }
+        process.exit(0)
+      })
     })
   }
 })
diff --git a/src/cli/commands/id.js b/src/cli/commands/id.js
index ba477a5ffd..7287155953 100644
--- a/src/cli/commands/id.js
+++ b/src/cli/commands/id.js
@@ -1,8 +1,9 @@
 const Command = require('ronin').Command
 const IPFS = require('../../ipfs-core')
 const debug = require('debug')
-const log = debug('cli:id')
-log.error = debug('cli:id:error')
+const utils = require('../utils')
+const log = debug('cli')
+log.error = debug('cli:error')
 
 module.exports = Command.extend({
   desc: 'Shows IPFS Node ID info',
@@ -14,11 +15,23 @@ module.exports = Command.extend({
     }
   },
 
-  run: name => {
-    const node = new IPFS()
-    node.id((err, id) => {
-      if (err) { return log.error(err) }
-      console.log(id)
-    })
+  run: (name) => {
+    if (utils.isDaemonOn()) {
+      const ctl = utils.getAPICtl()
+      ctl.id((err, result) => {
+        if (err) {
+          return log.error(err)
+        }
+        console.log(result)
+      })
+    } else {
+      const node = new IPFS()
+      node.id((err, id) => {
+        if (err) {
+          return log.error(err)
+        }
+        console.log(id)
+      })
+    }
   }
 })
diff --git a/src/cli/utils.js b/src/cli/utils.js
new file mode 100644
index 0000000000..23f3b9c4b9
--- /dev/null
+++ b/src/cli/utils.js
@@ -0,0 +1,32 @@
+const fs = require('fs')
+const os = require('os')
+const APIctl = require('ipfs-api')
+const multiaddr = require('multiaddr')
+const debug = require('debug')
+const log = debug('cli')
+log.error = debug('cli:error')
+
+exports = module.exports
+
+const repoPath = process.env.IPFS_PATH || os.homedir() + '/.ipfs'
+
+exports.isDaemonOn = isDaemonOn
+function isDaemonOn () {
+  try {
+    fs.readFileSync(repoPath + '/api')
+    log('daemon is on')
+    return true
+  } catch (err) {
+    log('daemon is off')
+    return false
+  }
+}
+
+exports.getAPICtl = () => {
+  if (!isDaemonOn) {
+    throw new Error('daemon is not on')
+  }
+
+  const apiAddr = multiaddr(fs.readFileSync(repoPath + '/api').toString())
+  return APIctl(apiAddr.toString())
+}
diff --git a/src/help-menu.js b/src/help-menu.js
deleted file mode 100644
index 914865bb25..0000000000
--- a/src/help-menu.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = function help () {
-  var help = ['Usage: ' + this.programName + ' ' + this.name + ' [OPTIONS]']
-  help.push('\n\nOPTIONS:\n\n')
-  var options = this.options
-  Object.keys(options).forEach(function (key) {
-    var line = '  '
-    line = line + '-' + options[key].alias + ', --' + key + '\t'
-    line = line + options[key].type + '\t'
-    line = line + '- ' + options[key].desc
-    help.push(line + '\n')
-  })
-
-  return help
-}
diff --git a/src/http-api/index.js b/src/http-api/index.js
index 6d66f0ed75..f7f047322d 100644
--- a/src/http-api/index.js
+++ b/src/http-api/index.js
@@ -3,38 +3,66 @@
 const Hapi = require('hapi')
 const IPFS = require('../ipfs-core')
 const debug = require('debug')
+const fs = require('fs')
+const os = require('os')
 const log = debug('api')
 log.error = debug('api:error')
 
 exports = module.exports
 
-exports.start = callback => {
-  // start IPFS and exports.ipfs = new IPFS()
+exports.start = (callback) => {
+  const ipfs = exports.ipfs = new IPFS()
 
-  exports.ipfs = new IPFS()
+  const repoPath = process.env.IPFS_PATH || os.homedir() + '/.ipfs'
+  try {
+    fs.statSync(repoPath + '/api')
+    console.log('This repo is currently being used by another daemon')
+    process.exit(1)
+  } catch (err) {
+    fs.writeFileSync(repoPath + '/api', 'api is on by js-ipfs', {flag: 'w+'})
+  }
 
-  var server = exports.server = new Hapi.Server({
-    connections: {
-      routes: {
-        cors: true
-      }
+  ipfs.config.show((err, config) => {
+    if (err) {
+      return callback(err)
     }
-  })
 
-  server.connection({
-    port: 9001
-  })
+    // TODO: set up cors correctly, following config
+    var server = exports.server = new Hapi.Server({
+      connections: {
+        routes: {
+          cors: true
+        }
+      }
+    })
+    const api = config.Addresses.API.split('/')
+    const gateway = config.Addresses.Gateway.split('/')
 
-  // load routes
-  require('./routes')
+    // for the CLI to know the where abouts of the API
+    fs.writeFileSync(repoPath + '/api', config.Addresses.API)
 
-  server.start(err => {
-    if (err) { return callback(err) }
-    log('server started: ' + server.info.uri)
-    callback()
+    // select which connection with server.select(<label>) to add routes
+    server.connection({ host: api[2], port: api[4], labels: 'API' })
+    server.connection({ host: gateway[2], port: gateway[4], labels: 'Gateway' })
+
+    // load routes
+    require('./routes')
+
+    server.start((err) => {
+      if (err) {
+        return callback(err)
+      }
+      const api = server.select('API')
+      const gateway = server.select('Gateway')
+      console.log('API is listening on: ' + api.info.uri)
+      console.log('Gateway (readonly) is listening on: ' + gateway.info.uri)
+      callback()
+    })
   })
 }
 
 exports.stop = callback => {
+  const repoPath = process.env.IPFS_PATH || os.homedir() + '/.ipfs'
+  fs.unlinkSync(repoPath + '/api')
   exports.server.stop(callback)
 }
diff --git a/src/http-api/resources/block.js b/src/http-api/resources/block.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/http-api/resources/bootstrap.js b/src/http-api/resources/bootstrap.js
new file mode 100644
index 0000000000..8cb6c5d439
--- /dev/null
+++ b/src/http-api/resources/bootstrap.js
@@ -0,0 +1,27 @@
+const ipfs = require('./../index.js').ipfs
+const boom = require('boom')
+
+exports = module.exports
+
+exports.list = (request, reply) => {
+  ipfs.bootstrap.list((err, list) => {
+    if (err) {
+      return reply(boom.badRequest(err))
+    }
+    return reply(list)
+  })
+}
+
+exports.add = (request, reply) => {
+//  ipfs.id((err, id) => {
+//    if (err) { return reply(boom.badRequest(err)) }
+//    return reply(id)
+//   })
+}
+
+exports.rm = (request, reply) => {
+//  ipfs.id((err, id) => {
+//    if (err) { return reply(boom.badRequest(err)) }
+//    return reply(id)
+//   })
+}
diff --git a/src/http-api/resources/config.js b/src/http-api/resources/config.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/http-api/resources/id.js b/src/http-api/resources/id.js
index 79b39759e4..58ed34472b 100644
--- a/src/http-api/resources/id.js
+++ b/src/http-api/resources/id.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const ipfs = require('./../index.js').ipfs
 const boom = require('boom')
 
diff --git a/src/http-api/resources/index.js b/src/http-api/resources/index.js
index 8b370daa81..4aecd49f28 100644
--- a/src/http-api/resources/index.js
+++ b/src/http-api/resources/index.js
@@ -1,2 +1,7 @@
 exports.version = require('./version')
 exports.id = require('./id')
+exports.bootstrap = require('./bootstrap')
+exports.repo = require('./repo')
+exports.object = require('./object')
+exports.config = require('./config')
+exports.block = require('./block')
diff --git a/src/http-api/resources/object.js b/src/http-api/resources/object.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/http-api/resources/repo.js b/src/http-api/resources/repo.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/http-api/resources/version.js b/src/http-api/resources/version.js
index f08a7e190d..41b34bb1c7 100644
--- a/src/http-api/resources/version.js
+++ b/src/http-api/resources/version.js
@@ -1,13 +1,28 @@
-'use strict'
-
 const ipfs = require('./../index.js').ipfs
 const boom = require('boom')
 
 exports = module.exports
 
 exports.get = (request, reply) => {
-  ipfs.version((err, version) => {
-    if (err) { return reply(boom.badRequest(err)) }
-    return reply(version)
+  ipfs.version((err, ipfsVersion) => {
+    if (err) {
+      return reply(boom.badRequest(err))
+    }
+
+    ipfs.repo.version((err, repoVersion) => {
+      if (err) {
+        return reply(boom.badRequest(err))
+      }
+
+      console.log('--------->')
+
+      reply({
+        Version: ipfsVersion,
+        Commit: '',
+        Repo: repoVersion
+      }).header('Transfer-Encoding', 'chunked')
+        // .header('Trailer', 'X-Stream-Error')
+        .type('application/json')
+    })
   })
 }
diff --git a/src/http-api/routes/block.js b/src/http-api/routes/block.js
new file mode 100644
index 0000000000..570365ea0d
--- /dev/null
+++ b/src/http-api/routes/block.js
@@ -0,0 +1,10 @@
+const api = require('./../index.js').server.select('API')
+const resources = require('./../resources')
+
+// TODO
+
+api.route({
+  method: 'GET',
+  path: '/api/v0/block',
+  handler: resources.block
+})
diff --git a/src/http-api/routes/bootstrap.js b/src/http-api/routes/bootstrap.js
index 7f93670b83..18e1f32934 100644
--- a/src/http-api/routes/bootstrap.js
+++ b/src/http-api/routes/bootstrap.js
@@ -1,22 +1,47 @@
-'use strict'
-
-const server = require('./../index.js').server
+const api = require('./../index.js').server.select('API')
 const resources = require('./../resources')
+const Joi = require('joi')
 
-server.route({
+// https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L818
+api.route({
   method: 'GET',
   path: '/api/v0/bootstrap',
-  handler: resources.version.list
+  handler: resources.bootstrap.list
 })
 
-server.route({
-  method: 'POST',
-  path: '/api/v0/bootstrap',
-  handler: resources.version.add
+// https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L866
+api.route({
+  method: 'GET',
+  path: '/api/v0/bootstrap/add',
+  handler: resources.bootstrap.add,
+  config: {
+    validate: {
+      query: {
+        arg: Joi.string().required(), // multiaddr to add
+        default: Joi.boolean()
+      }
+    }
+  }
 })
 
-server.route({
-  method: 'DELETE',
-  path: '/api/v0/bootstrap',
-  handler: resources.version.add
+// https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L1081
+api.route({
+  method: 'GET',
+  path: '/api/v0/bootstrap/list',
+  handler: resources.bootstrap.list
+})
+
+// https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L1131
+api.route({
+  method: 'GET',
+  path: '/api/v0/bootstrap/rm',
+  handler: resources.bootstrap.rm,
+  config: {
+    validate: {
+      query: {
+        arg: Joi.string().required(), // multiaddr to rm
+        all: Joi.boolean()
+      }
+    }
+  }
 })
diff --git a/src/http-api/routes/config.js b/src/http-api/routes/config.js
new file mode 100644
index 0000000000..62be916cc4
--- /dev/null
+++ b/src/http-api/routes/config.js
@@ -0,0 +1,10 @@
+const api = require('./../index.js').server.select('API')
+const resources = require('./../resources')
+
+// TODO
+
+api.route({
+  method: 'GET',
+  path: '/api/v0/config',
+  handler: resources.config
+})
diff --git a/src/http-api/routes/id.js b/src/http-api/routes/id.js
index 1d34399a5f..65c0d842ab 100644
--- a/src/http-api/routes/id.js
+++ b/src/http-api/routes/id.js
@@ -1,9 +1,7 @@
-'use strict'
-
-const server = require('./../index.js').server
+const api = require('./../index.js').server.select('API')
 const resources = require('./../resources')
 
-server.route({
+api.route({
   method: 'GET',
   path: '/api/v0/id',
   handler: resources.id.get
diff --git a/src/http-api/routes/index.js b/src/http-api/routes/index.js
index 1a865494dd..bde22e774b 100644
--- a/src/http-api/routes/index.js
+++ b/src/http-api/routes/index.js
@@ -1,2 +1,7 @@
 require('./version')
 require('./id')
+require('./bootstrap')
+// require('./block')
+// require('./object')
+// require('./repo')
+// require('./config')
diff --git a/src/http-api/routes/object.js b/src/http-api/routes/object.js
new file mode 100644
index 0000000000..0bf200f95d
--- /dev/null
+++ b/src/http-api/routes/object.js
@@ -0,0 +1,10 @@
+const api = require('./../index.js').server.select('API')
+const resources = require('./../resources')
+
+// TODO
+
+api.route({
+  method: 'GET',
+  path: '/api/v0/object',
+  handler: resources.object
+})
diff --git a/src/http-api/routes/repo.js b/src/http-api/routes/repo.js
new file mode 100644
index 0000000000..d230c40f30
--- /dev/null
+++ b/src/http-api/routes/repo.js
@@ -0,0 +1,10 @@
+const api = require('./../index.js').server.select('API')
+const resources = require('./../resources')
+
+// TODO
+
+api.route({
+  method: 'GET',
+  path: '/api/v0/repo',
+  handler: resources.repo
+})
diff --git a/src/http-api/routes/version.js b/src/http-api/routes/version.js
index 95a878d285..e2a8f2a702 100644
--- a/src/http-api/routes/version.js
+++ b/src/http-api/routes/version.js
@@ -1,9 +1,7 @@
-'use strict'
-
-const server = require('./../index.js').server
+const api = require('./../index.js').server.select('API')
 const resources = require('./../resources')
 
-server.route({
+api.route({
   method: 'GET',
   path: '/api/v0/version',
   handler: resources.version.get
diff --git a/src/ipfs-core/index.js b/src/ipfs-core/index.js
index af726b4fdb..f30e790016 100644
--- a/src/ipfs-core/index.js
+++ b/src/ipfs-core/index.js
@@ -20,13 +20,10 @@ function IPFS (repo) {
   if (!repo) {
     repo = defaultRepo()
   }
+
   const blockS = new BlockService(repo)
   const dagS = new DAGService(blockS)
 
-  this.daemon = callback => {
-    // 1. read repo to get peer data
-  }
-
   this.version = (opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
@@ -80,7 +77,7 @@ function IPFS (repo) {
       }
       repo.exists((err, res) => {
         if (err) { return callback(err) }
-        repo.version.read(callback)
+        repo.version.get(callback)
       })
     },
 
@@ -113,7 +110,7 @@ function IPFS (repo) {
             return false
           } else { return true }
         })
-        repo.config.set(config, err => {
+        repo.config.set(config, (err) => {
           if (err) { return callback(err) }
           callback()
         })
diff --git a/tests/repo-example/config b/tests/repo-example/config
index cbcdfe3b6e..7acd853818 100644
--- a/tests/repo-example/config
+++ b/tests/repo-example/config
@@ -1 +1 @@
-{"Identity":{"PeerID":"QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A","PrivKey":"CAASpgkwggSiAgEAAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAECggEAZtju/bcKvKFPz0mkHiaJcpycy9STKphorpCT83srBVQi59CdFU6Mj+aL/xt0kCPMVigJw8P3/YCEJ9J+rS8BsoWE+xWUEsJvtXoT7vzPHaAtM3ci1HZd302Mz1+GgS8Epdx+7F5p80XAFLDUnELzOzKftvWGZmWfSeDnslwVONkL/1VAzwKy7Ce6hk4SxRE7l2NE2OklSHOzCGU1f78ZzVYKSnS5Ag9YrGjOAmTOXDbKNKN/qIorAQ1bovzGoCwx3iGIatQKFOxyVCyO1PsJYT7JO+kZbhBWRRE+L7l+ppPER9bdLFxs1t5CrKc078h+wuUr05S1P1JjXk68pk3+kQKBgQDeK8AR11373Mzib6uzpjGzgNRMzdYNuExWjxyxAzz53NAR7zrPHvXvfIqjDScLJ4NcRO2TddhXAfZoOPVH5k4PJHKLBPKuXZpWlookCAyENY7+Pd55S8r+a+MusrMagYNljb5WbVTgN8cgdpim9lbbIFlpN6SZaVjLQL3J8TWH6wKBgQDSChzItkqWX11CNstJ9zJyUE20I7LrpyBJNgG1gtvz3ZMUQCn3PxxHtQzN9n1P0mSSYs+jBKPuoSyYLt1wwe10/lpgL4rkKWU3/m1Myt0tveJ9WcqHh6tzcAbb/fXpUFT/o4SWDimWkPkuCb+8j//2yiXk0a/T2f36zKMuZvujqQKBgC6B7BAQDG2H2B/ijofp12ejJU36nL98gAZyqOfpLJ+FeMz4TlBDQ+phIMhnHXA5UkdDapQ+zA3SrFk+6yGk9Vw4Hf46B+82SvOrSbmnMa+PYqKYIvUzR4gg34rL/7AhwnbEyD5hXq4dHwMNsIDq+l2elPjwm/U9V0gdAl2+r50HAoGALtsKqMvhv8HucAMBPrLikhXP/8um8mMKFMrzfqZ+otxfHzlhI0L08Bo3jQrb0Z7ByNY6M8epOmbCKADsbWcVre/AAY0ZkuSZK/CaOXNX/AhMKmKJh8qAOPRY02LIJRBCpfS4czEdnfUhYV/TYiFNnKRj57PPYZdTzUsxa/yVTmECgYBr7slQEjb5Onn5mZnGDh+72BxLNdgwBkhO0OCdpdISqk0F0Pxby22DFOKXZEpiyI9XYP1C8wPiJsShGm2yEwBPWXnrrZNWczaVuCbXHrZkWQogBDG3HGXNdU4MAWCyiYlyinIBpPpoAJZSzpGLmWbMWh28+RJS6AQX6KHrK1o2uw=="},"Datastore":{"Type":"","Path":"","StorageMax":"","StorageGCWatermark":0,"GCPeriod":"","Params":null,"NoSync":false},"Addresses":{"Swarm":["/ip4/0.0.0.0/tcp/4001","/ip6/::/tcp/4001"],"API":"/ip4/127.0.0.1/tcp/5001","Gateway":"/ip4/127.0.0.1/tcp/8080"},"Mounts":{"IPFS":"/ipfs","IPNS":"/ipns","FuseAllowOther":false},"Version":{"Current":"0.4.0-dev","Check":"error","CheckDate":"0001-01-01T00:00:00Z","CheckPeriod":"172800000000000","AutoUpdate":"minor"},"Discovery":{"MDNS":{"Enabled":true,"Interval":10}},"Ipns":{"RepublishPeriod":"","RecordLifetime":"","ResolveCacheSize":128},"Bootstrap":["/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ","/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z","/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM","/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm","/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu","/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64","/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd","/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3","/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx"],"Tour":{"Last":""},"Gateway":{"HTTPHeaders":null,"RootRedirect":"","Writable":false},"SupernodeRouting":{"Servers":["/ip4/104.236.176.52/tcp/4002/ipfs/QmXdb7tWTxdFEQEFgWBqkuYSrZd3mXrC7HxkD4krGNYx2U","/ip4/104.236.179.241/tcp/4002/ipfs/QmVRqViDByUxjUMoPnjurjKvZhaEMFDtK35FJXHAM4Lkj6","/ip4/104.236.151.122/tcp/4002/ipfs/QmSZwGx8Tn8tmcM4PtDJaMeUQNRhNFdBLVGPzRiNaRJtFH","/ip4/162.243.248.213/tcp/4002/ipfs/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP","/ip4/128.199.219.111/tcp/4002/ipfs/Qmb3brdCYmKG1ycwqCbo6LUwWxTuo3FisnJV2yir7oN92R","/ip4/104.236.76.40/tcp/4002/ipfs/QmdRBCV8Cz2dGhoKLkD3YjPwVFECmqADQkx5ZteF2c6Fy4","/ip4/178.62.158.247/tcp/4002/ipfs/QmUdiMPci7YoEUBkyFZAh2pAbjqcPr7LezyiPD2artLw3v","/ip4/178.62.61.185/tcp/4002/ipfs/QmVw6fGNqBixZE4bewRLT2VXX7fAHUHs8JyidDiJ1P7RUN"]},"API":{"HTTPHeaders":null},"Swarm":{"AddrFilters":null},"Log":{"MaxSizeMB":250,"MaxBackups":1,"MaxAgeDays":0}}
\ No newline at end of file
+{"Identity":{"PeerID":"QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A","PrivKey":"CAASpgkwggSiAgEAAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAECggEAZtju/bcKvKFPz0mkHiaJcpycy9STKphorpCT83srBVQi59CdFU6Mj+aL/xt0kCPMVigJw8P3/YCEJ9J+rS8BsoWE+xWUEsJvtXoT7vzPHaAtM3ci1HZd302Mz1+GgS8Epdx+7F5p80XAFLDUnELzOzKftvWGZmWfSeDnslwVONkL/1VAzwKy7Ce6hk4SxRE7l2NE2OklSHOzCGU1f78ZzVYKSnS5Ag9YrGjOAmTOXDbKNKN/qIorAQ1bovzGoCwx3iGIatQKFOxyVCyO1PsJYT7JO+kZbhBWRRE+L7l+ppPER9bdLFxs1t5CrKc078h+wuUr05S1P1JjXk68pk3+kQKBgQDeK8AR11373Mzib6uzpjGzgNRMzdYNuExWjxyxAzz53NAR7zrPHvXvfIqjDScLJ4NcRO2TddhXAfZoOPVH5k4PJHKLBPKuXZpWlookCAyENY7+Pd55S8r+a+MusrMagYNljb5WbVTgN8cgdpim9lbbIFlpN6SZaVjLQL3J8TWH6wKBgQDSChzItkqWX11CNstJ9zJyUE20I7LrpyBJNgG1gtvz3ZMUQCn3PxxHtQzN9n1P0mSSYs+jBKPuoSyYLt1wwe10/lpgL4rkKWU3/m1Myt0tveJ9WcqHh6tzcAbb/fXpUFT/o4SWDimWkPkuCb+8j//2yiXk0a/T2f36zKMuZvujqQKBgC6B7BAQDG2H2B/ijofp12ejJU36nL98gAZyqOfpLJ+FeMz4TlBDQ+phIMhnHXA5UkdDapQ+zA3SrFk+6yGk9Vw4Hf46B+82SvOrSbmnMa+PYqKYIvUzR4gg34rL/7AhwnbEyD5hXq4dHwMNsIDq+l2elPjwm/U9V0gdAl2+r50HAoGALtsKqMvhv8HucAMBPrLikhXP/8um8mMKFMrzfqZ+otxfHzlhI0L08Bo3jQrb0Z7ByNY6M8epOmbCKADsbWcVre/AAY0ZkuSZK/CaOXNX/AhMKmKJh8qAOPRY02LIJRBCpfS4czEdnfUhYV/TYiFNnKRj57PPYZdTzUsxa/yVTmECgYBr7slQEjb5Onn5mZnGDh+72BxLNdgwBkhO0OCdpdISqk0F0Pxby22DFOKXZEpiyI9XYP1C8wPiJsShGm2yEwBPWXnrrZNWczaVuCbXHrZkWQogBDG3HGXNdU4MAWCyiYlyinIBpPpoAJZSzpGLmWbMWh28+RJS6AQX6KHrK1o2uw=="},"Datastore":{"Type":"","Path":"","StorageMax":"","StorageGCWatermark":0,"GCPeriod":"","Params":null,"NoSync":false},"Addresses":{"Swarm":["/ip4/0.0.0.0/tcp/4001","/ip6/::/tcp/4001"],"API":"/ip4/127.0.0.1/tcp/6001","Gateway":"/ip4/127.0.0.1/tcp/9090"},"Mounts":{"IPFS":"/ipfs","IPNS":"/ipns","FuseAllowOther":false},"Version":{"Current":"0.4.0-dev","Check":"error","CheckDate":"0001-01-01T00:00:00Z","CheckPeriod":"172800000000000","AutoUpdate":"minor"},"Discovery":{"MDNS":{"Enabled":true,"Interval":10}},"Ipns":{"RepublishPeriod":"","RecordLifetime":"","ResolveCacheSize":128},"Bootstrap":["/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ","/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z","/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM","/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm","/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu","/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64","/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd","/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3","/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx"],"Tour":{"Last":""},"Gateway":{"HTTPHeaders":null,"RootRedirect":"","Writable":false},"SupernodeRouting":{"Servers":["/ip4/104.236.176.52/tcp/4002/ipfs/QmXdb7tWTxdFEQEFgWBqkuYSrZd3mXrC7HxkD4krGNYx2U","/ip4/104.236.179.241/tcp/4002/ipfs/QmVRqViDByUxjUMoPnjurjKvZhaEMFDtK35FJXHAM4Lkj6","/ip4/104.236.151.122/tcp/4002/ipfs/QmSZwGx8Tn8tmcM4PtDJaMeUQNRhNFdBLVGPzRiNaRJtFH","/ip4/162.243.248.213/tcp/4002/ipfs/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP","/ip4/128.199.219.111/tcp/4002/ipfs/Qmb3brdCYmKG1ycwqCbo6LUwWxTuo3FisnJV2yir7oN92R","/ip4/104.236.76.40/tcp/4002/ipfs/QmdRBCV8Cz2dGhoKLkD3YjPwVFECmqADQkx5ZteF2c6Fy4","/ip4/178.62.158.247/tcp/4002/ipfs/QmUdiMPci7YoEUBkyFZAh2pAbjqcPr7LezyiPD2artLw3v","/ip4/178.62.61.185/tcp/4002/ipfs/QmVw6fGNqBixZE4bewRLT2VXX7fAHUHs8JyidDiJ1P7RUN"]},"API":{"HTTPHeaders":null},"Swarm":{"AddrFilters":null},"Log":{"MaxSizeMB":250,"MaxBackups":1,"MaxAgeDays":0}}
\ No newline at end of file
diff --git a/tests/test-api/test-id.js b/tests/test-api/test-id.js
deleted file mode 100644
index 1caa77c19f..0000000000
--- a/tests/test-api/test-id.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* globals describe, it */
-
-'use strict'
-
-const expect = require('chai').expect
-const api = require('../../src/http-api')
-
-describe('id', function () {
-  it('get the id', done => {
-    api.server.inject({
-      method: 'GET',
-      url: '/api/v0/id'
-    }, res => {
-      expect(res.result).to.deep.equal({ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',
-        PublicKey: 'CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAE=',
-        Addresses: { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],
-          API: '/ip4/127.0.0.1/tcp/5001',
-        Gateway: '/ip4/127.0.0.1/tcp/8080' },
-        AgentVersion: 'js-ipfs',
-        ProtocolVersion: '9000'
-      })
-      done()
-    })
-  })
-})
diff --git a/tests/test-api/test-version.js b/tests/test-api/test-version.js
deleted file mode 100644
index 7c26451e1d..0000000000
--- a/tests/test-api/test-version.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* globals describe, it */
-
-'use strict'
-
-const expect = require('chai').expect
-const api = require('../../src/http-api')
-
-describe('version', function () {
-  it('get the version', done => {
-    api.server.inject({
-      method: 'GET',
-      url: '/api/v0/version'
-    }, res => {
-      expect(res.result).to.equal('0.4.0-dev')
-      done()
-    })
-  })
-})
diff --git a/tests/test-cli-offline/index.js b/tests/test-cli-offline/index.js
deleted file mode 100644
index b240ee2327..0000000000
--- a/tests/test-cli-offline/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* globals describe, before, after */
-
-'use strict'
-
-const fs = require('fs')
-const ncp = require('ncp').ncp
-const rimraf = require('rimraf')
-const expect = require('chai').expect
-
-describe('cli-offline', () => {
-  const repoExample = process.cwd() + '/tests/repo-example'
-  const repoTests = process.cwd() + '/tests/repo-tests' + Date.now()
-
-  before(done => {
-    ncp(repoExample, repoTests, err => {
-      process.env.IPFS_PATH = repoTests
-      expect(err).to.equal(null)
-      done()
-    })
-  })
-
-  after(done => {
-    rimraf(repoTests, err => {
-      expect(err).to.equal(null)
-      done()
-    })
-  })
-
-  const tests = fs.readdirSync(__dirname)
-  tests.filter(file => {
-    if (file === 'index.js') {
-      return false
-    } else {
-      return true
-    }
-  }).forEach(file => {
-    require('./' + file)
-  })
-})
diff --git a/tests/test-cli-offline/test-bootstrap.js b/tests/test-cli-offline/test-bootstrap.js
deleted file mode 100644
index bf7002cf1a..0000000000
--- a/tests/test-cli-offline/test-bootstrap.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/* globals describe, it */
-
-'use strict'
-
-const expect = require('chai').expect
-const nexpect = require('nexpect')
-
-describe('bootstrap', () => {
-  const defaultList = [
-    '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-    '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
-    '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
-    '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-    '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
-    '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
-    '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
-    '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
-    '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
-  ]
-
-  const updatedList = [
-    '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-    '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
-    '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
-    '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-    '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
-    '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
-    '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
-    '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
-    '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx',
-    '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'
-  ]
-
-  it('list the bootstrap nodes', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
-      .run((err, stdout, exitcode) => {
-        expect(stdout).to.deep.equal(defaultList)
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        done()
-      })
-  })
-
-  it('add another bootstrap node', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'add', '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'])
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-
-        nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
-          .run((err, stdout, exitcode) => {
-            expect(stdout).to.deep.equal(updatedList)
-            expect(err).to.not.exist
-            expect(exitcode).to.equal(0)
-            done()
-          })
-      })
-  })
-
-  it('rm a bootstrap node', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'rm', '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'])
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-
-        nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
-          .run((err, stdout, exitcode) => {
-            expect(stdout).to.deep.equal(defaultList)
-            expect(err).to.not.exist
-            expect(exitcode).to.equal(0)
-            done()
-          })
-      })
-  })
-})
diff --git a/tests/test-cli-offline/test-id.js b/tests/test-cli-offline/test-id.js
deleted file mode 100644
index 0ccee5728d..0000000000
--- a/tests/test-cli-offline/test-id.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* globals describe, it */
-
-'use strict'
-
-const expect = require('chai').expect
-const nexpect = require('nexpect')
-
-describe('id', () => {
-  it('get the id', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'id'])
-      .run((err, stdout, exitcode) => {
-        var expected = [ "{ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',",
-          "  PublicKey: 'CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAE=',",
-          '  Addresses: ',
-          "   { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],",
-          "     API: '/ip4/127.0.0.1/tcp/5001',",
-          "     Gateway: '/ip4/127.0.0.1/tcp/8080' },",
-          "  AgentVersion: 'js-ipfs',",
-          "  ProtocolVersion: '9000' }" ]
-
-        expect(stdout[0]).to.equal(expected[0])
-        expect(stdout[1]).to.equal(expected[1])
-        expect(stdout[2]).to.equal(expected[2])
-        expect(stdout[3]).to.equal(expected[3])
-        expect(stdout[4]).to.equal(expected[4])
-        expect(stdout[5]).to.equal(expected[5])
-        expect(stdout[6]).to.equal(expected[6])
-        expect(stdout[7]).to.equal(expected[7])
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        done()
-      })
-  })
-})
diff --git a/tests/test-cli-offline/test-version.js b/tests/test-cli-offline/test-version.js
deleted file mode 100644
index f6be02c148..0000000000
--- a/tests/test-cli-offline/test-version.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* globals describe, it */
-
-'use strict'
-
-const expect = require('chai').expect
-const nexpect = require('nexpect')
-
-describe('version', () => {
-  it('get the version', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'version'])
-      .expect('0.4.0-dev')
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        done()
-      })
-  })
-})
diff --git a/tests/test-cli/index.js b/tests/test-cli/index.js
index bf15631cac..fb62eadb88 100644
--- a/tests/test-cli/index.js
+++ b/tests/test-cli/index.js
@@ -1,6 +1,4 @@
-/* globals describe, before, after */
-
-'use strict'
+/* eslint-env mocha */
 
 const fs = require('fs')
 const ncp = require('ncp').ncp
@@ -9,7 +7,7 @@ const expect = require('chai').expect
 
 describe('cli', () => {
   const repoExample = process.cwd() + '/tests/repo-example'
-  const repoTests = exports.repoTests = process.cwd() + '/tests/repo-tests' + Date.now()
+  const repoTests = exports.repoTests = process.cwd() + '/tests/repo-tests-run'
 
   before(done => {
     ncp(repoExample, repoTests, err => {
@@ -28,7 +26,7 @@ describe('cli', () => {
 
   const tests = fs.readdirSync(__dirname)
   tests.filter(file => {
-    if (file === 'index.js') {
+    if (file === 'index.js' || file === 'api.js') {
       return false
     } else {
       return true
diff --git a/tests/test-cli/test-bootstrap.js b/tests/test-cli/test-bootstrap.js
new file mode 100644
index 0000000000..7d402b17a5
--- /dev/null
+++ b/tests/test-cli/test-bootstrap.js
@@ -0,0 +1,79 @@
+/* eslint-env mocha */
+
+const expect = require('chai').expect
+const nexpect = require('nexpect')
+
+describe('id', () => {
+  describe('api offline', () => {
+    const defaultList = [
+      '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
+      '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+      '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+      '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+      '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+      '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+      '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+      '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+      '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
+    ]
+
+    const updatedList = [
+      '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
+      '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+      '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+      '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+      '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+      '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+      '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+      '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+      '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx',
+      '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'
+    ]
+
+    it('list the bootstrap nodes', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
+        .run((err, stdout, exitcode) => {
+          expect(stdout).to.deep.equal(defaultList)
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          done()
+        })
+    })
+
+    it('add another bootstrap node', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'add', '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'])
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+
+          nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
+            .run((err, stdout, exitcode) => {
+              expect(stdout).to.deep.equal(updatedList)
+              expect(err).to.not.exist
+              expect(exitcode).to.equal(0)
+              done()
+            })
+        })
+    })
+
+    it('rm a bootstrap node', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'rm', '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'])
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+
+          nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
+            .run((err, stdout, exitcode) => {
+              expect(stdout).to.deep.equal(defaultList)
+              expect(err).to.not.exist
+              expect(exitcode).to.equal(0)
+              done()
+            })
+        })
+    })
+  })
+
+  describe('api running', () => {
+    // TODO
+  })
+})
diff --git a/tests/test-cli/test-config.js b/tests/test-cli/test-config.js
index c704f2274a..9256728209 100644
--- a/tests/test-cli/test-config.js
+++ b/tests/test-cli/test-config.js
@@ -1,87 +1,91 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 const nexpect = require('nexpect')
 const fs = require('fs')
 
 describe('config', () => {
-  const repoTests = require('./index').repoTests
-  const configPath = repoTests + '/config'
+  describe('api offline', () => {
+    const repoTests = require('./index').repoTests
+    const configPath = repoTests + '/config'
 
-  const updatedConfig = () => JSON.parse(fs.readFileSync(configPath, 'utf8'))
+    const updatedConfig = () => JSON.parse(fs.readFileSync(configPath, 'utf8'))
 
-  it('get a config key value', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'Identity.PeerID'])
-      .run((err, stdout, exitcode) => {
-        const expected = 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A'
-        expect(stdout[0]).to.equal(expected)
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        done()
-      })
-  })
+    it('get a config key value', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'Identity.PeerID'])
+        .run((err, stdout, exitcode) => {
+          const expected = 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A'
+          expect(stdout[0]).to.equal(expected)
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          done()
+        })
+    })
 
-  it('set a config key with a string value', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', 'bar'])
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        expect(updatedConfig().foo).to.equal('bar')
-        done()
-      })
-  })
+    it('set a config key with a string value', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', 'bar'])
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          expect(updatedConfig().foo).to.equal('bar')
+          done()
+        })
+    })
 
-  it('set a config key with true', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', true, '--bool'])
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        expect(updatedConfig().foo).to.equal(true)
-        done()
-      })
-  })
+    it('set a config key with true', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', true, '--bool'])
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          expect(updatedConfig().foo).to.equal(true)
+          done()
+        })
+    })
 
-  it('set a config key with false', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', false, '--bool'])
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        expect(updatedConfig().foo).to.equal(false)
-        done()
-      })
-  })
+    it('set a config key with false', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', false, '--bool'])
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          expect(updatedConfig().foo).to.equal(false)
+          done()
+        })
+    })
 
-  it('set a config key with json', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', '{"bar": 0}', '--json'])
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        expect(updatedConfig().foo).to.deep.equal({ bar: 0 })
-        done()
-      })
-  })
+    it('set a config key with json', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', '{"bar": 0}', '--json'])
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          expect(updatedConfig().foo).to.deep.equal({ bar: 0 })
+          done()
+        })
+    })
+
+    it('set a config key with invalid json', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', '{"bar: 0}', '--json'])
+        .run((err, stdout, exitcode) => {
+          const expected = 'error\tinvalid JSON provided'
+          expect(stdout[0]).to.equal(expected)
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(1)
+          done()
+        })
+    })
 
-  it('set a config key with invalid json', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', '{"bar: 0}', '--json'])
-      .run((err, stdout, exitcode) => {
-        const expected = 'error\tinvalid JSON provided'
-        expect(stdout[0]).to.equal(expected)
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(1)
-        done()
-      })
+    it('call config with no arguments', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config'])
+        .run((err, stdout, exitcode) => {
+          const expected = "error\targument 'key' is required"
+          expect(stdout[0]).to.equal(expected)
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(1)
+          done()
+        })
+    })
   })
 
-  it('call config with no arguments', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config'])
-      .run((err, stdout, exitcode) => {
-        const expected = "error\targument 'key' is required"
-        expect(stdout[0]).to.equal(expected)
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(1)
-        done()
-      })
+  describe('api running', () => {
+    // TODO
   })
 })
diff --git a/tests/test-cli/test-id.js b/tests/test-cli/test-id.js
index 0ccee5728d..ec26aef2d7 100644
--- a/tests/test-cli/test-id.js
+++ b/tests/test-cli/test-id.js
@@ -1,34 +1,77 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 const nexpect = require('nexpect')
+const httpAPI = require('../../src/http-api')
 
 describe('id', () => {
-  it('get the id', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'id'])
-      .run((err, stdout, exitcode) => {
-        var expected = [ "{ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',",
-          "  PublicKey: 'CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAE=',",
-          '  Addresses: ',
-          "   { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],",
-          "     API: '/ip4/127.0.0.1/tcp/5001',",
-          "     Gateway: '/ip4/127.0.0.1/tcp/8080' },",
-          "  AgentVersion: 'js-ipfs',",
-          "  ProtocolVersion: '9000' }" ]
+  describe('api offline', () => {
+    it('get the id', (done) => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'id'])
+        .run((err, stdout, exitcode) => {
+          var expected = [ "{ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',",
+            "  PublicKey: 'CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAE=',",
+            '  Addresses: ',
+            "   { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],",
+            "     API: '/ip4/127.0.0.1/tcp/6001',",
+            "     Gateway: '/ip4/127.0.0.1/tcp/9090' },",
+            "  AgentVersion: 'js-ipfs',",
+            "  ProtocolVersion: '9000' }" ]
+
+          expect(stdout[0]).to.equal(expected[0])
+          expect(stdout[1]).to.equal(expected[1])
+          expect(stdout[2]).to.equal(expected[2])
+          expect(stdout[3]).to.equal(expected[3])
+          expect(stdout[4]).to.equal(expected[4])
+          expect(stdout[5]).to.equal(expected[5])
+          expect(stdout[6]).to.equal(expected[6])
+          expect(stdout[7]).to.equal(expected[7])
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          done()
+        })
+    })
+  })
 
-        expect(stdout[0]).to.equal(expected[0])
-        expect(stdout[1]).to.equal(expected[1])
-        expect(stdout[2]).to.equal(expected[2])
-        expect(stdout[3]).to.equal(expected[3])
-        expect(stdout[4]).to.equal(expected[4])
-        expect(stdout[5]).to.equal(expected[5])
-        expect(stdout[6]).to.equal(expected[6])
-        expect(stdout[7]).to.equal(expected[7])
+  describe('api running', () => {
+    before((done) => {
+      httpAPI.start((err) => {
         expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
         done()
       })
+    })
+
+    after((done) => {
+      httpAPI.stop((err) => {
+        expect(err).to.not.exist
+        done()
+      })
+    })
+
+    it('get the id', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'id'])
+        .run((err, stdout, exitcode) => {
+          var expected = [ "{ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',",
+            "  PublicKey: 'CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAE=',",
+            '  Addresses: ',
+            "   { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],",
+            "     API: '/ip4/127.0.0.1/tcp/6001',",
+            "     Gateway: '/ip4/127.0.0.1/tcp/9090' },",
+            "  AgentVersion: 'js-ipfs',",
+            "  ProtocolVersion: '9000' }" ]
+
+          expect(stdout[0]).to.equal(expected[0])
+          expect(stdout[1]).to.equal(expected[1])
+          expect(stdout[2]).to.equal(expected[2])
+          expect(stdout[3]).to.equal(expected[3])
+          expect(stdout[4]).to.equal(expected[4])
+          expect(stdout[5]).to.equal(expected[5])
+          expect(stdout[6]).to.equal(expected[6])
+          expect(stdout[7]).to.equal(expected[7])
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          done()
+        })
+    })
   })
 })
diff --git a/tests/test-cli/test-version.js b/tests/test-cli/test-version.js
index f6be02c148..fe5d0c8604 100644
--- a/tests/test-cli/test-version.js
+++ b/tests/test-cli/test-version.js
@@ -1,18 +1,22 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 const nexpect = require('nexpect')
 
 describe('version', () => {
-  it('get the version', done => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'version'])
-      .expect('0.4.0-dev')
-      .run((err, stdout, exitcode) => {
-        expect(err).to.not.exist
-        expect(exitcode).to.equal(0)
-        done()
-      })
+  describe('api offline', () => {
+    it('get the version', done => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'version'])
+        .expect('0.4.0-dev')
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          done()
+        })
+    })
+  })
+
+  describe('api running', () => {
+    // TODO
   })
 })
diff --git a/tests/test-core/browser.js b/tests/test-core/browser.js
index fa9a4ca696..ff1c7ce6f9 100644
--- a/tests/test-core/browser.js
+++ b/tests/test-core/browser.js
@@ -1,4 +1,4 @@
-/* globals describe, before */
+/* eslint-env mocha */
 
 const async = require('async')
 const store = require('idb-plus-blob-store')
diff --git a/tests/test-core/index.js b/tests/test-core/index.js
index 4b096fe87b..1aa116ba39 100644
--- a/tests/test-core/index.js
+++ b/tests/test-core/index.js
@@ -1,6 +1,4 @@
-/* globals describe, before, after */
-
-'use strict'
+/* eslint-env mocha */
 
 const fs = require('fs')
 const ncp = require('ncp').ncp
@@ -9,7 +7,7 @@ const expect = require('chai').expect
 
 describe('core', () => {
   const repoExample = process.cwd() + '/tests/repo-example'
-  const repoTests = process.cwd() + '/tests/repo-tests' + Date.now()
+  const repoTests = process.cwd() + '/tests/repo-tests-run'
 
   before(done => {
     ncp(repoExample, repoTests, err => {
diff --git a/tests/test-core/test-block.js b/tests/test-core/test-block.js
index da808c71be..45a1715eef 100644
--- a/tests/test-core/test-block.js
+++ b/tests/test-core/test-block.js
@@ -1,6 +1,4 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 const base58 = require('bs58')
diff --git a/tests/test-core/test-bootstrap.js b/tests/test-core/test-bootstrap.js
index 9566401b15..7c749a6037 100644
--- a/tests/test-core/test-bootstrap.js
+++ b/tests/test-core/test-bootstrap.js
@@ -1,6 +1,4 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 
diff --git a/tests/test-core/test-config.js b/tests/test-core/test-config.js
index 9a9ceafd22..723a67a591 100644
--- a/tests/test-core/test-config.js
+++ b/tests/test-core/test-config.js
@@ -1,6 +1,4 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 const IPFS = require('../../src/ipfs-core')
@@ -18,8 +16,8 @@ describe('config', () => {
       Params: null,
     NoSync: false },
     Addresses: { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],
-      API: '/ip4/127.0.0.1/tcp/5001',
-    Gateway: '/ip4/127.0.0.1/tcp/8080' },
+      API: '/ip4/127.0.0.1/tcp/6001',
+    Gateway: '/ip4/127.0.0.1/tcp/9090' },
     Mounts: { IPFS: '/ipfs', IPNS: '/ipns', FuseAllowOther: false },
     Version: { Current: '0.4.0-dev',
       Check: 'error',
diff --git a/tests/test-core/test-id.js b/tests/test-core/test-id.js
index 421f2db268..cec987963b 100644
--- a/tests/test-core/test-id.js
+++ b/tests/test-core/test-id.js
@@ -1,6 +1,4 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 
@@ -14,9 +12,11 @@ describe('id', () => {
       expect(err).to.not.exist
       expect(id).to.deep.equal({ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',
         PublicKey: 'CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAE=',
-        Addresses: { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],
-          API: '/ip4/127.0.0.1/tcp/5001',
-        Gateway: '/ip4/127.0.0.1/tcp/8080' },
+        Addresses: {
+          Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],
+          API: '/ip4/127.0.0.1/tcp/6001',
+          Gateway: '/ip4/127.0.0.1/tcp/9090'
+        },
         AgentVersion: 'js-ipfs',
         ProtocolVersion: '9000'
       })
diff --git a/tests/test-core/test-object.js b/tests/test-core/test-object.js
index 16dbd80202..233f06e1bd 100644
--- a/tests/test-core/test-object.js
+++ b/tests/test-core/test-object.js
@@ -1,6 +1,4 @@
-/* globals describe, before, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 const IPFS = require('../../src/ipfs-core')
diff --git a/tests/test-core/test-version.js b/tests/test-core/test-version.js
index bd205d68c0..e0f416d502 100644
--- a/tests/test-core/test-version.js
+++ b/tests/test-core/test-version.js
@@ -1,6 +1,4 @@
-/* globals describe, it */
-
-'use strict'
+/* eslint-env mocha */
 
 const expect = require('chai').expect
 
diff --git a/tests/test-api/index.js b/tests/test-http-api/index.js
similarity index 75%
rename from tests/test-api/index.js
rename to tests/test-http-api/index.js
index 50ddc4d406..1c24fef69c 100644
--- a/tests/test-api/index.js
+++ b/tests/test-http-api/index.js
@@ -1,6 +1,4 @@
-/* globals describe, before, after */
-
-'use strict'
+/* eslint-env mocha */
 
 const fs = require('fs')
 const expect = require('chai').expect
@@ -8,15 +6,15 @@ const api = require('../../src/http-api')
 const ncp = require('ncp').ncp
 const rimraf = require('rimraf')
 
-describe('api', () => {
+describe('http api', () => {
   const repoExample = process.cwd() + '/tests/repo-example'
-  const repoTests = process.cwd() + '/tests/repo-tests' + Date.now()
+  const repoTests = process.cwd() + '/tests/repo-tests-run'
   process.env.IPFS_PATH = repoTests
 
   before(done => {
-    ncp(repoExample, repoTests, err => {
+    ncp(repoExample, repoTests, (err) => {
       expect(err).to.not.exist
-      api.start(err => {
+      api.start((err) => {
         expect(err).to.not.exist
         done()
       })
@@ -26,7 +24,7 @@ describe('api', () => {
   after(done => {
     api.stop((err) => {
       expect(err).to.not.exist
-      rimraf(repoTests, err => {
+      rimraf(repoTests, (err) => {
         expect(err).to.not.exist
         done()
       })
diff --git a/tests/test-http-api/test-block.js b/tests/test-http-api/test-block.js
new file mode 100644
index 0000000000..a1260895e8
--- /dev/null
+++ b/tests/test-http-api/test-block.js
@@ -0,0 +1,23 @@
+/* eslint-env mocha */
+
+// const expect = require('chai').expect
+// const APIctl = require('ipfs-api')
+
+describe('block', () => {
+  describe('api', () => {
+    // TODO
+  })
+
+  describe('gateway', () => {})
+
+  describe('using js-ipfs-api', () => {
+//    var ctl
+
+    it('start IPFS API ctl', (done) => {
+//      ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
+      done()
+    })
+
+    // TODO
+  })
+})
diff --git a/tests/test-http-api/test-bootstrap.js b/tests/test-http-api/test-bootstrap.js
new file mode 100644
index 0000000000..7c48f225d0
--- /dev/null
+++ b/tests/test-http-api/test-bootstrap.js
@@ -0,0 +1,104 @@
+/* eslint-env mocha */
+
+const expect = require('chai').expect
+const APIctl = require('ipfs-api')
+
+describe('bootstrap', () => {
+  describe('api', () => {
+    var api
+
+    it('api', (done) => {
+      api = require('../../src/http-api').server.select('API')
+      done()
+    })
+
+    it('list', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bootstrap'
+      }, (res) => {
+        expect(res.result).to.deep.equal(defaultList)
+        done()
+      })
+    })
+
+    it('list 2', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bootstrap/list'
+      }, (res) => {
+        expect(res.result).to.deep.equal(defaultList)
+        done()
+      })
+    })
+
+    it('add', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bootstrap/add',
+        payload: {
+          arg: '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'
+        }
+      }, (res) => {
+        done()
+      })
+    })
+
+    it('rm', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bootstrap/rm',
+        payload: {
+          arg: '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'
+        }
+      }, (res) => {
+        done()
+      })
+    })
+
+    it('confirm list is as expected', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bootstrap/list'
+      }, (res) => {
+        expect(res.result).to.deep.equal(defaultList)
+        done()
+      })
+    })
+  })
+
+  describe('gateway', () => {})
+
+  describe('using js-ipfs-api', () => {
+    var ctl
+
+    it('start IPFS API ctl', (done) => {
+      ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
+      done()
+    })
+
+    // TODO: needs https://github.com/ipfs/js-ipfs-api/issues/217
+    it.skip('list', (done) => {
+      ctl.boostrap.list((err, result) => {
+        expect(err).to.not.exist
+        expect(result).to.deep.equal(defaultList)
+        done()
+      })
+    })
+
+    it.skip('add', (done) => {})
+    it.skip('rm', (done) => {})
+  })
+})
+
+const defaultList = [
+  '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
+  '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+  '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+  '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+  '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+  '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+  '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+  '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+  '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
+]
diff --git a/tests/test-http-api/test-config.js b/tests/test-http-api/test-config.js
new file mode 100644
index 0000000000..ebcfa6ed31
--- /dev/null
+++ b/tests/test-http-api/test-config.js
@@ -0,0 +1,23 @@
+/* eslint-env mocha */
+
+// const expect = require('chai').expect
+// const APIctl = require('ipfs-api')
+
+describe('version', () => {
+  describe('api', () => {
+    // TODO
+  })
+
+  describe('gateway', () => {
+    // TODO
+  })
+
+  describe('using js-ipfs-api', () => {
+//    var ctl
+
+    it('start IPFS API ctl', (done) => {
+//      ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
+      done()
+    })
+  })
+})
diff --git a/tests/test-http-api/test-id.js b/tests/test-http-api/test-id.js
new file mode 100644
index 0000000000..517c485e65
--- /dev/null
+++ b/tests/test-http-api/test-id.js
@@ -0,0 +1,56 @@
+/* eslint-env mocha */
+
+const expect = require('chai').expect
+const APIctl = require('ipfs-api')
+
+describe('id', () => {
+  describe('api', () => {
+    var api
+
+    it('api', (done) => {
+      api = require('../../src/http-api').server.select('API')
+      done()
+    })
+
+    it('get the id', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/id'
+      }, (res) => {
+        expect(res.result).to.deep.equal(idResult)
+        done()
+      })
+    })
+  })
+
+  describe('gateway', () => {})
+
+  describe('using js-ipfs-api', () => {
+    var ctl
+
+    it('start IPFS API ctl', (done) => {
+      ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
+      done()
+    })
+
+    it('get the id', (done) => {
+      ctl.id((err, result) => {
+        expect(err).to.not.exist
+        expect(result).to.deep.equal(idResult)
+        done()
+      })
+    })
+  })
+})
+
+const idResult = {
+  ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',
+  PublicKey: 'CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2SKo/HMFZeBml1AF3XijzrxrfQXdJzjePBZAbdxqKR1Mc6juRHXij6HXYPjlAk01BhF1S3Ll4Lwi0cAHhggf457sMg55UWyeGKeUv0ucgvCpBwlR5cQ020i0MgzjPWOLWq1rtvSbNcAi2ZEVn6+Q2EcHo3wUvWRtLeKz+DZSZfw2PEDC+DGPJPl7f8g7zl56YymmmzH9liZLNrzg/qidokUv5u1pdGrcpLuPNeTODk0cqKB+OUbuKj9GShYECCEjaybJDl9276oalL9ghBtSeEv20kugatTvYy590wFlJkkvyl+nPxIH0EEYMKK9XRWlu9XYnoSfboiwcv8M3SlsjAgMBAAE=',
+  Addresses: {
+    Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],
+    API: '/ip4/127.0.0.1/tcp/6001',
+    Gateway: '/ip4/127.0.0.1/tcp/9090'
+  },
+  AgentVersion: 'js-ipfs',
+  ProtocolVersion: '9000'
+}
diff --git a/tests/test-http-api/test-object.js b/tests/test-http-api/test-object.js
new file mode 100644
index 0000000000..5fc532a5da
--- /dev/null
+++ b/tests/test-http-api/test-object.js
@@ -0,0 +1,21 @@
+/* eslint-env mocha */
+
+// const expect = require('chai').expect
+// const APIctl = require('ipfs-api')
+
+describe('object', () => {
+  describe('api', () => {
+    // TODO
+  })
+
+  describe('gateway', () => {})
+
+  describe('using js-ipfs-api', () => {
+//    var ctl
+
+    it('start IPFS API ctl', (done) => {
+//      ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
+      done()
+    })
+  })
+})
diff --git a/tests/test-http-api/test-repo.js b/tests/test-http-api/test-repo.js
new file mode 100644
index 0000000000..f98b450fc8
--- /dev/null
+++ b/tests/test-http-api/test-repo.js
@@ -0,0 +1,23 @@
+/* eslint-env mocha */
+
+// const expect = require('chai').expect
+// const APIctl = require('ipfs-api')
+
+describe('repo', () => {
+  describe('api', () => {
+    // TODO
+  })
+
+  describe('gateway', () => {})
+
+  describe('using js-ipfs-api', () => {
+//    var ctl
+
+    it('start IPFS API ctl', (done) => {
+//      ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
+      done()
+    })
+
+    // TODO
+  })
+})
diff --git a/tests/test-http-api/test-version.js b/tests/test-http-api/test-version.js
new file mode 100644
index 0000000000..cb9473b1cc
--- /dev/null
+++ b/tests/test-http-api/test-version.js
@@ -0,0 +1,49 @@
+/* eslint-env mocha */
+
+const expect = require('chai').expect
+const APIctl = require('ipfs-api')
+
+describe('version', () => {
+  describe('api', () => {
+    var api
+
+    it('api', (done) => {
+      api = require('../../src/http-api').server.select('API')
+      done()
+    })
+
+    it('get the version', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/version'
+      }, res => {
+        expect(res.result.Version).to.equal('0.4.0-dev')
+        expect(res.result).to.have.a.property('Commit')
+        expect(res.result).to.have.a.property('Repo')
+        done()
+      })
+    })
+  })
+
+  describe('gateway', () => {})
+
+  describe('using js-ipfs-api', () => {
+    var ctl
+
+    it('start IPFS API ctl', (done) => {
+      ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
+      done()
+    })
+
+    // TODO fix: only fails on travis
+    it.skip('get the version', (done) => {
+      ctl.version((err, result) => {
+        expect(err).to.not.exist
+        expect(result).to.have.a.property('Version')
+        expect(result).to.have.a.property('Commit')
+        expect(result).to.have.a.property('Repo')
+        done()
+      })
+    })
+  })
+})