diff --git a/src/peer-discovery/README.md b/src/peer-discovery/README.md
index a0551d0..f66b0ba 100644
--- a/src/peer-discovery/README.md
+++ b/src/peer-discovery/README.md
@@ -70,9 +70,9 @@ It returns a `Promise`
 
 ### discoverying peers
 
-- `discovery.on('peer', (peerInfo) => {})`
+- `discovery.on('peer', (peerData) => {})`
 
-Everytime a peer is discovered by a discovery service, it emmits a `peer` event with the discovered peer's information, which must contain the following properties:
+Every time a peer is discovered by a discovery service, it emits a `peer` event with the discovered peer's information, which must contain the following properties:
 
-- `<`[`PeerId`](https://github.com/libp2p/js-peer-id)`>` `peerInfo.id`
-- `<Array<`[`Multiaddr`](https://github.com/multiformats/js-multiaddr)`>>` `peerInfo.multiaddrs`
+- `<`[`PeerId`](https://github.com/libp2p/js-peer-id)`>` `peerData.id`
+- `<Array<`[`Multiaddr`](https://github.com/multiformats/js-multiaddr)`>>` `peerData.multiaddrs`
diff --git a/src/peer-discovery/tests/index.js b/src/peer-discovery/tests/index.js
index a9b41da..bdcda80 100644
--- a/src/peer-discovery/tests/index.js
+++ b/src/peer-discovery/tests/index.js
@@ -19,12 +19,12 @@ module.exports = (common) => {
       discovery = await common.setup()
     })
 
-    after(() => common.teardown && common.teardown())
-
     afterEach('ensure discovery was stopped', async () => {
       await discovery.stop()
 
       discovery.removeAllListeners()
+
+      common.teardown && common.teardown()
     })
 
     it('can start the service', async () => {
@@ -45,7 +45,7 @@ module.exports = (common) => {
       await discovery.start()
     })
 
-    it('should listen a peer event after start', async () => {
+    it('should emit a peer event after start', async () => {
       const defer = pDefer()
       await discovery.start()
 
@@ -59,7 +59,7 @@ module.exports = (common) => {
         defer.resolve()
       })
 
-      return defer.promise
+      await defer.promise
     })
 
     it('should not receive a peer event before start', async () => {
diff --git a/test/peer-discovery/compliance.spec.js b/test/peer-discovery/compliance.spec.js
index 6b35681..7ab0d6d 100644
--- a/test/peer-discovery/compliance.spec.js
+++ b/test/peer-discovery/compliance.spec.js
@@ -8,9 +8,7 @@ describe('compliance tests', () => {
   let intervalId
 
   tests({
-    async setup () {
-      await new Promise(resolve => setTimeout(resolve, 10))
-
+    setup () {
       const mockDiscovery = new MockDiscovery({
         discoveryDelay: 1
       })
@@ -19,9 +17,8 @@ describe('compliance tests', () => {
 
       return mockDiscovery
     },
-    async teardown () {
+    teardown () {
       clearInterval(intervalId)
-      await new Promise(resolve => setTimeout(resolve, 10))
     }
   })
 })