diff --git a/README.md b/README.md
index 96f0712..a0de266 100644
--- a/README.md
+++ b/README.md
@@ -83,8 +83,6 @@ If `err` is passed, no operation should be made in `stream`.
 
 `stream` interface our established Stream with the other endpoint, it must implement the [Duplex pull-stream interface](https://pull-stream.github.io) in JavaScript or the [ReadWriteCloser](http://golang.org/pkg/io/#ReadWriteCloser) in Go.
 
-In the JavaScript case, if no callback is passed, stream will emit an 'ready' event when it is prepared or a 'error' event if it fails to establish the connection, until then, it will buffer the 'write' calls.
-
 ### Listen(wait/accept) a new incoming stream
 
 - `JavaScript` muxedConn.on('stream', function (stream) {})
diff --git a/package.json b/package.json
index 4f06026..fcec055 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "interface-stream-muxer",
   "version": "0.3.1",
   "description": "A test suite and interface you can use to implement a stream muxer.",
-  "main": "src/index.js",
+  "main": "lib/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
     "test": "exit(0)",
@@ -21,7 +21,6 @@
   "keywords": [
     "Streams",
     "Muxer",
-    "interface",
     "Interface"
   ],
   "author": "David Dias <daviddias@ipfs.io>",
@@ -34,6 +33,7 @@
     "async": "^2.0.1",
     "chai": "^3.5.0",
     "chai-checkmark": "^1.0.1",
+    "detect-node": "^2.0.3",
     "libp2p-tcp": "^0.8.1",
     "multiaddr": "^2.0.2",
     "pull-generate": "^2.2.0",
@@ -43,6 +43,6 @@
     "run-series": "^1.1.4"
   },
   "devDependencies": {
-    "aegir": "^6.0.1"
+    "aegir": "^8.0.0"
   }
 }
diff --git a/src/close-test.js b/src/close-test.js
index f7bdc38..601ee99 100644
--- a/src/close-test.js
+++ b/src/close-test.js
@@ -1,4 +1,5 @@
 /* eslint-env mocha */
+/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const chai = require('chai')
@@ -11,7 +12,7 @@ const series = require('run-series')
 const Tcp = require('libp2p-tcp')
 const multiaddr = require('multiaddr')
 
-const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
+const mh = multiaddr('/ip4/127.0.0.1/tcp/10000')
 
 function closeAndWait (stream) {
   pull(
@@ -24,7 +25,7 @@ function closeAndWait (stream) {
 }
 
 module.exports = (common) => {
-  describe.only('close', () => {
+  describe('close', () => {
     let muxer
 
     beforeEach((done) => {
@@ -40,14 +41,14 @@ module.exports = (common) => {
 
       const tcp = new Tcp()
       const tcpListener = tcp.createListener((socket) => {
-        const listener = muxer.listen(socket)
+        const listener = muxer.listener(socket)
         listener.on('stream', (stream) => {
           pull(stream, stream)
         })
       })
 
       tcpListener.listen(mh, () => {
-        const dialer = muxer.dial(tcp.dial(mh, () => {
+        const dialer = muxer.dialer(tcp.dial(mh, () => {
           tcpListener.close()
         }))
 
@@ -73,8 +74,8 @@ module.exports = (common) => {
 
     it('closing one of the muxed streams doesn\'t close others', (done) => {
       const p = pair()
-      const dialer = muxer.dial(p[0])
-      const listener = muxer.listen(p[1])
+      const dialer = muxer.dialer(p[0])
+      const listener = muxer.listener(p[1])
 
       expect(6).checks(done)
 
diff --git a/src/index.js b/src/index.js
index b182e27..9006539 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,14 +2,17 @@
 'use strict'
 
 const baseTest = require('./base-test')
-const closeTest = require('./close-test')
 const stressTest = require('./stress-test')
 const megaStressTest = require('./mega-stress-test')
+const isNode = require('detect-node')
 
 module.exports = (common) => {
   describe('interface-stream-muxer', () => {
     baseTest(common)
-    closeTest(common)
+    if (isNode) {
+      const closeTest = require('./close-test')
+      closeTest(common)
+    }
     stressTest(common)
     megaStressTest(common)
   })