diff --git a/test/integration/eth-simulator.js b/test/integration/eth-simulator.js
index 68b9f39..223f625 100644
--- a/test/integration/eth-simulator.js
+++ b/test/integration/eth-simulator.js
@@ -2,15 +2,16 @@ const test = require('tape')
 const devp2p = require('../../src')
 const util = require('./util.js')
 
-const capabilities = [
-  devp2p.ETH.eth63,
-  devp2p.ETH.eth62
-]
 const CHAIN_ID = 1
 
 const GENESIS_TD = 17179869184
 const GENESIS_HASH = Buffer.from('d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3', 'hex')
 
+var capabilities = [
+  devp2p.ETH.eth63,
+  devp2p.ETH.eth62
+]
+
 const status = {
   networkId: CHAIN_ID,
   td: devp2p._util.int2buffer(GENESIS_TD),
@@ -18,25 +19,156 @@ const status = {
   genesisHash: GENESIS_HASH
 }
 
-async function delay (ms) {
-  await new Promise((resolve) => setTimeout(resolve, ms))
-}
+// FIXME: Handle unhandled promises directly
+process.on('unhandledRejection', (reason, p) => {})
 
-test('ETH: send status message', async (t) => {
-  const rlpxs = util.initTwoPeerRLPXSetup(null, capabilities)
+function twoPeerMsgExchange (t, tpCap, echoStatus, onOnceStatus, onPeerError0, onPeerError1, onOnMsg0, onOnMsg1) {
+  const rlpxs = util.initTwoPeerRLPXSetup(null, tpCap)
 
   rlpxs[0].on('peer:added', function (peer) {
     const eth = peer.getProtocols()[0]
-    // FIXME: ETH events are not going through here
-    /* eth.on('message', async (code, payload) => {
+    eth.sendStatus(status) // (1 ->)
+
+    eth.once('status', () => { if (onOnceStatus) onOnceStatus(rlpxs, eth) }) // (-> 2)
+    eth.on('message', async (code, payload) => { if (onOnMsg0) onOnMsg0(rlpxs, eth, code, payload) })
+    peer.on('error', (err) => {
+      if (onPeerError0) {
+        onPeerError0(err, rlpxs)
+      } else {
+        console.log(`Unexpected peer 0 error: ${err}`)
+      }
+    }) // (-> 2)
+  })
+
+  rlpxs[1].on('peer:added', function (peer) {
+    const eth = peer.getProtocols()[0]
+    eth.on('message', async (code, payload) => {
+      switch (code) {
+        case devp2p.ETH.MESSAGE_CODES.STATUS: // (-> 1)
+          t.pass('should receive initial status message')
+          eth.sendStatus(echoStatus) // (2 ->)
+          break
+      }
+      if (onOnMsg1) onOnMsg1(rlpxs, eth, code, payload)
+    })
+    peer.on('error', (err) => {
+      if (onPeerError1) {
+        onPeerError1(err, rlpxs)
+      } else {
+        console.log(`Unexpected peer 1 error: ${err}`)
+      }
+    })
+  })
+}
+
+test('ETH: send status message (successful)', async (t) => {
+  let onOnceStatus = function (rlpxs, eth) {
+    t.pass('should receive echoing status message and welcome connection')
+    util.destroyRLPXs(rlpxs)
+    t.end()
+  }
+  twoPeerMsgExchange(t, capabilities, status, onOnceStatus, null, null, null, null)
+})
+
+test('ETH: send status message (NetworkId mismatch)', async (t) => {
+  let echoStatus = Object.assign({}, status)
+  echoStatus['networkId'] = 2
+  let onPeerError0 = function (err, rlpxs) {
+    const msg = 'NetworkId mismatch: 01 / 02'
+    t.equal(err.message, msg, `should emit error: ${msg}`)
+    util.destroyRLPXs(rlpxs)
+    t.end()
+  }
+  twoPeerMsgExchange(t, capabilities, echoStatus, null, onPeerError0, null, null, null)
+})
+
+test('ETH: send status message (Genesis block mismatch)', async (t) => {
+  let echoStatus = Object.assign({}, status)
+  echoStatus['genesisHash'] = Buffer.alloc(32)
+  let onPeerError0 = function (err, rlpxs) {
+    const msg = 'Genesis block mismatch: d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3 / 0000000000000000000000000000000000000000000000000000000000000000'
+    t.equal(err.message, msg, `should emit error: ${msg}`)
+    util.destroyRLPXs(rlpxs)
+    t.end()
+  }
+  twoPeerMsgExchange(t, capabilities, echoStatus, null, onPeerError0, null, null, null)
+})
+
+test('ETH: send allowed eth63', async (t) => {
+  let onOnceStatus = function (rlpxs, eth) {
+    t.equal(eth.getVersion(), 63, 'should use eth63 as protocol version')
+    eth.sendMessage(devp2p.ETH.MESSAGE_CODES.NEW_BLOCK_HASHES, [ 437000, 1, 0, 0 ])
+    t.pass('should send NEW_BLOCK_HASHES message')
+  }
+  let onOnMsg1 = function (rlpxs, eth, code, payload) {
+    if (code === devp2p.ETH.MESSAGE_CODES.NEW_BLOCK_HASHES) {
+      t.pass('should receive NEW_BLOCK_HASHES message')
       util.destroyRLPXs(rlpxs)
       t.end()
-    }) */
-    eth.sendStatus(status)
-  })
+    }
+  }
+  twoPeerMsgExchange(t, capabilities, status, onOnceStatus, null, null, null, onOnMsg1)
+})
+
+test('ETH: send allowed eth62', async (t) => {
+  let cap = [
+    devp2p.ETH.eth62
+  ]
+  let onOnceStatus = function (rlpxs, eth) {
+    eth.sendMessage(devp2p.ETH.MESSAGE_CODES.NEW_BLOCK_HASHES, [ 437000, 1, 0, 0 ])
+    t.pass('should send NEW_BLOCK_HASHES message')
+  }
+  let onOnMsg1 = function (rlpxs, eth, code, payload) {
+    if (code === devp2p.ETH.MESSAGE_CODES.NEW_BLOCK_HASHES) {
+      t.pass('should receive NEW_BLOCK_HASHES message')
+      util.destroyRLPXs(rlpxs)
+      t.end()
+    }
+  }
+  twoPeerMsgExchange(t, cap, status, onOnceStatus, null, null, null, onOnMsg1)
+})
+
+test('ETH: send not-allowed eth62', async (t) => {
+  let cap = [
+    devp2p.ETH.eth62
+  ]
+  let onOnceStatus = function (rlpxs, eth) {
+    try {
+      eth.sendMessage(devp2p.ETH.MESSAGE_CODES.GET_NODE_DATA, [])
+    } catch (err) {
+      const msg = 'Error: Code 13 not allowed with version 62'
+      t.equal(err.toString(), msg, `should emit error: ${msg}`)
+      util.destroyRLPXs(rlpxs)
+      t.end()
+    }
+  }
+  twoPeerMsgExchange(t, cap, status, onOnceStatus, null, null, null, null)
+})
 
-  await delay(400)
-  t.pass('should send status message')
-  util.destroyRLPXs(rlpxs)
-  t.end()
+test('ETH: send unknown message code', async (t) => {
+  let onOnceStatus = function (rlpxs, eth) {
+    try {
+      eth.sendMessage(0x55, [])
+    } catch (err) {
+      const msg = 'Error: Unknown code 85'
+      t.equal(err.toString(), msg, `should emit error: ${msg}`)
+      util.destroyRLPXs(rlpxs)
+      t.end()
+    }
+  }
+  twoPeerMsgExchange(t, capabilities, status, onOnceStatus, null, null, null, null)
+})
+
+test('ETH: invalid status send', async (t) => {
+  let onOnceStatus = function (rlpxs, eth) {
+    try {
+      eth.sendMessage(devp2p.ETH.MESSAGE_CODES.STATUS, [])
+    } catch (err) {
+      const msg = 'Error: Please send status message through .sendStatus'
+      t.equal(err.toString(), msg, `should emit error: ${msg}`)
+      util.destroyRLPXs(rlpxs)
+      t.end()
+    }
+  }
+  twoPeerMsgExchange(t, capabilities, status, onOnceStatus, null, null, null, null)
 })