diff --git a/src/adapters/ipfs/ipfs-coord.js b/src/adapters/ipfs/ipfs-coord.js
index dc735fd..2d7c375 100644
--- a/src/adapters/ipfs/ipfs-coord.js
+++ b/src/adapters/ipfs/ipfs-coord.js
@@ -178,7 +178,7 @@ class IpfsCoordAdapter {
   // It passes the data on to the REST API library by emitting an event.
   peerInputHandler (data) {
     try {
-      console.log('peerInputHandler triggered with this data: ', data)
+      // console.log('peerInputHandler triggered with this data: ', data)
 
       this.eventEmitter.emit('rpcData', data)
     } catch (err) {
diff --git a/src/controllers/json-rpc/index.js b/src/controllers/json-rpc/index.js
index b3b2119..6880445 100644
--- a/src/controllers/json-rpc/index.js
+++ b/src/controllers/json-rpc/index.js
@@ -62,6 +62,7 @@ class JSONRPC {
       // Attempt to parse the incoming data as a JSON RPC string.
       const parsedData = _this.jsonrpc.parse(str)
       // wlogger.debug(`parsedData: ${JSON.stringify(parsedData, null, 2)}`)
+      // console.log(`parsedData; ${JSON.stringify(parsedData, null, 2)}`)
 
       // Exit quietly if the incoming string is an invalid JSON RPC string.
       if (parsedData.type === 'invalid') {
@@ -71,7 +72,7 @@ class JSONRPC {
 
       // Check for duplicate entries with same 'id' value.
       const alreadyProcessed = _this._checkIfAlreadyProcessed(parsedData)
-      console.log(`alreadyProcessed: ${alreadyProcessed}`)
+      // console.log(`alreadyProcessed: ${alreadyProcessed}`)
       if (alreadyProcessed) {
         return false
       } else {
@@ -93,7 +94,7 @@ class JSONRPC {
 
         // Log the incoming JSON RPC command.
         wlogger.info(
-          `JSON RPC received from ${from}, ID: ${parsedData.payload.id}, type: ${parsedData.type}, method: ${parsedData.payload.method}`
+          `JSON RPC received from ${from}, ID: ${parsedData.payload.id}, type: ${parsedData.type}`
         )
       }
 
diff --git a/src/use-cases/bch.js b/src/use-cases/bch.js
index 3143741..c851f91 100644
--- a/src/use-cases/bch.js
+++ b/src/use-cases/bch.js
@@ -80,7 +80,7 @@ class BchUseCases {
   // Get the BCH balance for an array of addresses.
   async getBalances (addrs) {
     try {
-      console.log('addrs: ', addrs)
+      // console.log('addrs: ', addrs)
 
       // Throw an error if this IPFS node has not yet made a connection to a
       // wallet service provider.
@@ -100,7 +100,7 @@ class BchUseCases {
       // Generate a JSON RPC command.
       const cmd = this.jsonrpc.request(rpcId, 'bch', rpcData)
       const cmdStr = JSON.stringify(cmd)
-      console.log('cmdStr: ', cmdStr)
+      // console.log('cmdStr: ', cmdStr)
 
       // Send the RPC command to selected wallet service.
       const thisNode = this.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.thisNode
@@ -137,7 +137,7 @@ class BchUseCases {
 
       // Loop that waits for a response from the service provider.
       do {
-        console.log(`this.rpcDataQueue.length: ${this.rpcDataQueue.length}`)
+        // console.log(`this.rpcDataQueue.length: ${this.rpcDataQueue.length}`)
         for (let i = 0; i < this.rpcDataQueue.length; i++) {
           const rawData = this.rpcDataQueue[i]
           // console.log(`rawData: ${JSON.stringify(rawData, null, 2)}`)
diff --git a/test/e2e/automated/a02-users.rest-e2e.js b/test/e2e/automated/a02-users.rest-e2e.js
index d4a0125..fa729d3 100644
--- a/test/e2e/automated/a02-users.rest-e2e.js
+++ b/test/e2e/automated/a02-users.rest-e2e.js
@@ -13,7 +13,8 @@ const context = {}
 
 const UserController = require('../../../src/controllers/rest-api/users/controller')
 const Adapters = require('../../../src/adapters')
-const adapters = new Adapters()
+const EventEmitter = require('events')
+const adapters = new Adapters({ eventEmitter: new EventEmitter() })
 const UseCases = require('../../../src/use-cases/')
 let uut
 let sandbox
@@ -50,7 +51,7 @@ describe('Users', () => {
   })
 
   beforeEach(() => {
-    const useCases = new UseCases({ adapters })
+    const useCases = new UseCases({ adapters, eventEmitter: new EventEmitter() })
     uut = new UserController({ adapters, useCases })
 
     sandbox = sinon.createSandbox()
diff --git a/test/unit/adapters/ipfs-coord.adapter.unit.js b/test/unit/adapters/ipfs-coord.adapter.unit.js
index 40c8516..551f82b 100644
--- a/test/unit/adapters/ipfs-coord.adapter.unit.js
+++ b/test/unit/adapters/ipfs-coord.adapter.unit.js
@@ -8,6 +8,7 @@ const sinon = require('sinon')
 const IPFSCoordAdapter = require('../../../src/adapters/ipfs/ipfs-coord')
 const IPFSMock = require('../mocks/ipfs-mock')
 const IPFSCoordMock = require('../mocks/ipfs-coord-mock')
+const EventEmitter = require('events')
 
 describe('#IPFS', () => {
   let uut
@@ -15,7 +16,7 @@ describe('#IPFS', () => {
 
   beforeEach(() => {
     const ipfs = IPFSMock.create()
-    uut = new IPFSCoordAdapter({ ipfs })
+    uut = new IPFSCoordAdapter({ ipfs, eventEmitter: new EventEmitter() })
 
     sandbox = sinon.createSandbox()
   })
diff --git a/test/unit/adapters/ipfs-index.adapter.unit.js b/test/unit/adapters/ipfs-index.adapter.unit.js
index 3c36911..72d2fbb 100644
--- a/test/unit/adapters/ipfs-index.adapter.unit.js
+++ b/test/unit/adapters/ipfs-index.adapter.unit.js
@@ -8,13 +8,14 @@ const sinon = require('sinon')
 const IPFSLib = require('../../../src/adapters/ipfs')
 const IPFSMock = require('../mocks/ipfs-mock')
 const IPFSCoordMock = require('../mocks/ipfs-coord-mock')
+const EventEmitter = require('events')
 
 describe('#IPFS-adapter-index', () => {
   let uut
   let sandbox
 
   beforeEach(() => {
-    uut = new IPFSLib()
+    uut = new IPFSLib({ eventEmitter: new EventEmitter() })
 
     sandbox = sinon.createSandbox()
   })
diff --git a/test/unit/controllers/json-rpc/a10-rpc.unit.js b/test/unit/controllers/json-rpc/a10-rpc.unit.js
index efe6bfb..eb94a67 100644
--- a/test/unit/controllers/json-rpc/a10-rpc.unit.js
+++ b/test/unit/controllers/json-rpc/a10-rpc.unit.js
@@ -74,10 +74,17 @@ describe('#JSON RPC', () => {
     })
 
     it('should return default response if routing is not possible', async () => {
+      // Force desired code path
+      // sandbox
+      //   .stub(uut.adapters.ipfs.ipfsCoordAdapter, 'peerInputHandler')
+      //   .returns()
+      // uut.adapters.ipfs.ipfsCoordAdapter.peer
+
       const id = uid()
       const json = jsonrpc.request(id, 'unknownMethod', {})
 
       const str = JSON.stringify(json)
+      // console.log(`str: ${str}`)
 
       const result = await uut.router(str, 'peerA')
       // console.log('result: ', result)
@@ -204,7 +211,9 @@ describe('#JSON RPC', () => {
       // Force the RPC type to be 'success', to indicate an RPC that was
       // processed internal to ipfs-coord.
       sandbox.stub(uut.jsonrpc, 'parse').returns({
-        payload: {},
+        payload: {
+          id: 'metrics5323'
+        },
         type: 'success'
       })
 
diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js
index a236014..8fc182d 100644
--- a/test/unit/mocks/adapters/index.js
+++ b/test/unit/mocks/adapters/index.js
@@ -13,7 +13,8 @@ const ipfs = {
           sendPrivateMessage: () => {}
         }
       }
-    }
+    },
+    peerInputHandler: () => {}
   }
 }
 
diff --git a/test/unit/use-cases/index.use-case.unit.js b/test/unit/use-cases/index.use-case.unit.js
index a3043d0..4ddf0ef 100644
--- a/test/unit/use-cases/index.use-case.unit.js
+++ b/test/unit/use-cases/index.use-case.unit.js
@@ -5,6 +5,7 @@
 // Public npm libraries
 const assert = require('chai').assert
 const sinon = require('sinon')
+const EventEmitter = require('events')
 
 // Local support libraries
 // const testUtils = require('../../utils/test-utils')
@@ -25,7 +26,7 @@ describe('#use-cases', () => {
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    uut = new UseCases({ adapters })
+    uut = new UseCases({ adapters, eventEmitter: new EventEmitter() })
   })
 
   afterEach(() => sandbox.restore())