diff --git a/package.json b/package.json
index d19ebdc..4ab507c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "start": "node index.js",
     "test": "npm run test:all",
-    "test:all": "export BCH_DEX=test && nyc --reporter=text mocha --exit --timeout 30000 --recursive test/unit test/e2e/automated/",
+    "test:all": "export BCH_DEX=test && c8 --reporter=text mocha --exit --timeout 15000 --recursive test/unit test/e2e/automated/",
     "test:unit": "export BCH_DEX=test && mocha --exit --timeout 15000 --recursive test/unit/",
     "test:e2e:auto": "export BCH_DEX=test && mocha --exit --timeout 30000 test/e2e/automated/",
     "test:integration": "export BCH_DEX=test && mocha --exit --timeout 45000 --recursive test/integration",
diff --git a/src/adapters/bch.js b/src/adapters/bch.js
index ecdc06b..5f6f841 100644
--- a/src/adapters/bch.js
+++ b/src/adapters/bch.js
@@ -6,7 +6,7 @@
 import BCHJS from '@psf/bch-js'
 
 import MsgLib from 'bch-message-lib'
-import BchWallet from 'minimal-slp-wallet/index'
+import BchWallet from 'minimal-slp-wallet/index.js'
 
 class Bch {
   constructor () {
diff --git a/src/adapters/localdb/order-pagination.js b/src/adapters/localdb/order-pagination.js
index 0865b73..88b301e 100644
--- a/src/adapters/localdb/order-pagination.js
+++ b/src/adapters/localdb/order-pagination.js
@@ -3,7 +3,7 @@
   orders from the datatabase.
 */
 
-import Order from './models/order'
+import Order from './models/order.js'
 
 // let _this
 
diff --git a/src/adapters/p2wdb-adapter.js b/src/adapters/p2wdb-adapter.js
index 02bdbdf..9e94482 100644
--- a/src/adapters/p2wdb-adapter.js
+++ b/src/adapters/p2wdb-adapter.js
@@ -5,10 +5,10 @@
 // Public npm libraries.
 import axios from 'axios'
 
-import { Write, Read } from 'p2wdb/index'
+import { Write, Read } from 'p2wdb/index.js'
 
 // Local libraries
-import config from '../../config'
+import config from '../../config/index.js'
 
 class P2wdbAdapter {
   constructor (localConfig = {}) {
diff --git a/src/adapters/wallet.js b/src/adapters/wallet.js
index 7b28e7f..9cb68f1 100644
--- a/src/adapters/wallet.js
+++ b/src/adapters/wallet.js
@@ -3,14 +3,19 @@
 */
 
 // Public npm libraries
-import BchWallet from 'minimal-slp-wallet/index'
+import BchWallet from 'minimal-slp-wallet/index.js'
 
 import bitcoinJs from 'bitcoincashjs-lib'
 
 // Local libraries
-import JsonFiles from './json-files'
+import JsonFiles from './json-files.js'
 
-import config from '../../config'
+import config from '../../config/index.js'
+
+// Hack to get __dirname back.
+// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
+import * as url from 'url'
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 const WALLET_FILE = `${__dirname.toString()}/../../wallet.json`
 // const PROOF_OF_BURN_QTY = 0.01
diff --git a/src/adapters/webhook.js b/src/adapters/webhook.js
index b9da739..11d1f10 100644
--- a/src/adapters/webhook.js
+++ b/src/adapters/webhook.js
@@ -2,7 +2,7 @@
   The (Clean Architecture) Adapter for manageing a webhook connection to P2WDB.
 */
 
-import config from '../../config'
+import config from '../../config/index.js'
 
 import axios from 'axios'
 
diff --git a/src/controllers/rest-api/entry/index.js b/src/controllers/rest-api/entry/index.js
index baef1a1..7d75610 100644
--- a/src/controllers/rest-api/entry/index.js
+++ b/src/controllers/rest-api/entry/index.js
@@ -6,7 +6,7 @@
 import Router from 'koa-router'
 
 // Local libraries.
-import EntryRESTControllerLib from './controller'
+import EntryRESTControllerLib from './controller.js'
 
 let _this
 
diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index 0599c78..04be227 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -11,10 +11,10 @@ import AuthRESTController from './auth/index.js'
 import UserRouter from './users/index.js'
 import ContactRESTController from './contact/index.js'
 import LogsRESTController from './logs/index.js'
-import EntryRouter from './entry.js'
-import OfferRouter from './offer.js'
-import OrderRouter from './order.js'
-import P2WDBRouter from './p2wdb.js'
+import EntryRouter from './entry/index.js'
+import OfferRouter from './offer/index.js'
+import OrderRouter from './order/index.js'
+import P2WDBRouter from './p2wdb/index.js'
 
 class RESTControllers {
   constructor (localConfig = {}) {
diff --git a/src/controllers/rest-api/offer/controller.js b/src/controllers/rest-api/offer/controller.js
index 892b03d..968e3bc 100644
--- a/src/controllers/rest-api/offer/controller.js
+++ b/src/controllers/rest-api/offer/controller.js
@@ -2,7 +2,7 @@
   REST API Controller library for the /offer route
 */
 
-import { wlogger } from '../../../adapters/wlogger'
+import wlogger from '../../../adapters/wlogger.js'
 
 let _this
 
diff --git a/src/controllers/rest-api/offer/index.js b/src/controllers/rest-api/offer/index.js
index 41819a9..5370c77 100644
--- a/src/controllers/rest-api/offer/index.js
+++ b/src/controllers/rest-api/offer/index.js
@@ -6,7 +6,7 @@
 import Router from 'koa-router'
 
 // Local libraries.
-import OfferRESTControllerLib from './controller'
+import OfferRESTControllerLib from './controller.js'
 
 let _this
 
diff --git a/src/controllers/rest-api/order/index.js b/src/controllers/rest-api/order/index.js
index 3c6909a..07f8cb8 100644
--- a/src/controllers/rest-api/order/index.js
+++ b/src/controllers/rest-api/order/index.js
@@ -6,7 +6,7 @@
 import Router from 'koa-router'
 
 // Local libraries.
-import OrderRESTControllerLib from './controller'
+import OrderRESTControllerLib from './controller.js'
 
 let _this
 
diff --git a/src/controllers/rest-api/p2wdb/index.js b/src/controllers/rest-api/p2wdb/index.js
index e0e9260..af53f29 100644
--- a/src/controllers/rest-api/p2wdb/index.js
+++ b/src/controllers/rest-api/p2wdb/index.js
@@ -8,7 +8,7 @@
 import Router from 'koa-router'
 
 // Local libraries.
-import P2WDBRESTControllerLib from './controller'
+import P2WDBRESTControllerLib from './controller.js'
 
 let _this
 
diff --git a/src/use-cases/entry.js b/src/use-cases/entry.js
index 024e667..53aecde 100644
--- a/src/use-cases/entry.js
+++ b/src/use-cases/entry.js
@@ -1,5 +1,8 @@
-import { wlogger } from '../adapters/wlogger'
-import EntryEntiy from '../entities/entry'
+
+// local libraries
+import wlogger from '../adapters/wlogger.js'
+import EntryEntiy from '../entities/entry.js'
+
 class EntryLib {
   constructor (localConfig = {}) {
     // console.log('User localConfig: ', localConfig)
diff --git a/src/use-cases/index.js b/src/use-cases/index.js
index de44706..52f8a90 100644
--- a/src/use-cases/index.js
+++ b/src/use-cases/index.js
@@ -6,7 +6,7 @@
 
 import UserUseCases from './user.js'
 import EntryUseCases from './entry.js'
-import OfferUseCases from './offer.js'
+import OfferUseCases from './offer/index.js'
 import OrderUseCases from './order.js'
 
 class UseCases {
diff --git a/src/use-cases/offer/index.js b/src/use-cases/offer/index.js
index 6f6382a..9df3c2f 100644
--- a/src/use-cases/offer/index.js
+++ b/src/use-cases/offer/index.js
@@ -17,9 +17,9 @@
 import axios from 'axios'
 
 // Local libraries
-import OfferEntity from '../../entities/offer'
+import OfferEntity from '../../entities/offer.js'
 
-import config from '../../../config'
+import config from '../../../config/index.js'
 
 const DEFAULT_ENTRIES_PER_PAGE = 20
 const NFT_ENTRIES_PER_PAGE = 6
diff --git a/src/use-cases/offer/retry-queue.js b/src/use-cases/offer/retry-queue.js
index 4c57001..b511468 100644
--- a/src/use-cases/offer/retry-queue.js
+++ b/src/use-cases/offer/retry-queue.js
@@ -9,8 +9,8 @@
   pay-to-write-access-controller.js depends on this library.
 */
 
+// Global npm libraries
 import PQueue from 'p-queue'
-
 import pRetry from 'p-retry'
 
 let _this
diff --git a/src/use-cases/order.js b/src/use-cases/order.js
index eabd049..8cdde6b 100644
--- a/src/use-cases/order.js
+++ b/src/use-cases/order.js
@@ -3,10 +3,10 @@
 */
 
 // Local libraries
-import { wlogger } from '../adapters/wlogger'
+import wlogger from '../adapters/wlogger.js'
 
-import OrderEntity from '../entities/order'
-import config from '../../config'
+import OrderEntity from '../entities/order.js'
+import config from '../../config/index.js'
 
 class OrderLib {
   constructor (localConfig = {}) {
diff --git a/test/unit/adapters/bch.adapter.unit.js b/test/unit/adapters/bch.adapter.unit.js
index ba9646e..3e6a02c 100644
--- a/test/unit/adapters/bch.adapter.unit.js
+++ b/test/unit/adapters/bch.adapter.unit.js
@@ -1,5 +1,5 @@
 import { assert } from 'chai'
-import BCHJS from '../../../src/adapters/bch'
+import BCHJS from '../../../src/adapters/bch.js'
 import sinon from 'sinon'
 import util from 'util'
 util.inspect.defaultOptions = { depth: 1 }
diff --git a/test/unit/adapters/order-pagination.unit.js b/test/unit/adapters/order-pagination.unit.js
index a6e5a5a..4248722 100644
--- a/test/unit/adapters/order-pagination.unit.js
+++ b/test/unit/adapters/order-pagination.unit.js
@@ -12,10 +12,10 @@ import sinon from 'sinon'
 import mongoose from 'mongoose'
 
 // Local libraries.
-import OrderPagination from '../../../src/adapters/localdb/order-pagination'
+import OrderPagination from '../../../src/adapters/localdb/order-pagination.js'
 
-import Order from '../../../src/adapters/localdb/models/order'
-import config from '../../../config'
+import Order from '../../../src/adapters/localdb/models/order.js'
+import config from '../../../config/index.js'
 
 describe('#OrderPagination', () => {
   let uut, sandbox
diff --git a/test/unit/adapters/p2wdb.adapter.unit.js b/test/unit/adapters/p2wdb.adapter.unit.js
index 1683d93..99573ea 100644
--- a/test/unit/adapters/p2wdb.adapter.unit.js
+++ b/test/unit/adapters/p2wdb.adapter.unit.js
@@ -11,7 +11,7 @@ import sinon from 'sinon'
 import BchWallet from 'minimal-slp-wallet/index.js'
 
 // Local libraries.
-import P2wdbAdapter from '../../../src/adapters/p2wdb-adapter'
+import P2wdbAdapter from '../../../src/adapters/p2wdb-adapter.js'
 
 describe('#P2wdbAdapter', () => {
   let uut, sandbox, bchWallet
diff --git a/test/unit/adapters/wallet.adapter.unit.js b/test/unit/adapters/wallet.adapter.unit.js
index 5a91ac2..88bf07f 100644
--- a/test/unit/adapters/wallet.adapter.unit.js
+++ b/test/unit/adapters/wallet.adapter.unit.js
@@ -4,16 +4,20 @@
 
 // Public npm libraries.
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 import fs from 'fs'
 
 // const BCHJS = require('@psf/bch-js')
 
 // Local libraries.
-import WalletAdapter from '../../../src/adapters/wallet'
+import WalletAdapter from '../../../src/adapters/wallet.js'
 
-import { MockBchWallet } from '../mocks/adapters/wallet'
+import { MockBchWallet } from '../mocks/adapters/wallet.js'
+
+// Hack to get __dirname back.
+// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
+import * as url from 'url'
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 // Global constants
 const testWalletFile = `${__dirname.toString()}/test-wallet.json`
diff --git a/test/unit/adapters/webhook.adapter.unit.js b/test/unit/adapters/webhook.adapter.unit.js
index ef7524a..a5c2a9f 100644
--- a/test/unit/adapters/webhook.adapter.unit.js
+++ b/test/unit/adapters/webhook.adapter.unit.js
@@ -3,10 +3,9 @@
 */
 
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
-import WebHook from '../../../src/adapters/webhook'
+import WebHook from '../../../src/adapters/webhook.js'
 
 // Set the environment variable to signal this is a test.
 process.env.TORLIST_ENV = 'test'
diff --git a/test/unit/controllers/rest-api/entry/entry.rest.controller.unit.js b/test/unit/controllers/rest-api/entry/entry.rest.controller.unit.js
index 63719ba..1cc0620 100644
--- a/test/unit/controllers/rest-api/entry/entry.rest.controller.unit.js
+++ b/test/unit/controllers/rest-api/entry/entry.rest.controller.unit.js
@@ -8,12 +8,12 @@ import { assert } from 'chai'
 import sinon from 'sinon'
 
 // Local support libraries
-import adapters from '../../../mocks/adapters'
+import adapters from '../../../mocks/adapters/index.js'
 
-import UseCasesMock from '../../../mocks/use-cases'
-import EntryController from '../../../../../src/controllers/rest-api/entry/controller'
+import UseCasesMock from '../../../mocks/use-cases/index.js'
+import EntryController from '../../../../../src/controllers/rest-api/entry/controller.js'
 
-import { context as mockContext } from '../../../../unit/mocks/ctx-mock'
+import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
 let uut
 let sandbox
 let ctx
diff --git a/test/unit/controllers/rest-api/entry/entry.rest.router.unit.js b/test/unit/controllers/rest-api/entry/entry.rest.router.unit.js
index 4bbfa23..f85d3c8 100644
--- a/test/unit/controllers/rest-api/entry/entry.rest.router.unit.js
+++ b/test/unit/controllers/rest-api/entry/entry.rest.router.unit.js
@@ -4,17 +4,15 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
 // Local support libraries
-import adapters from '../../../mocks/adapters'
-
-import UseCasesMock from '../../../mocks/use-cases'
+import adapters from '../../../mocks/adapters/index.js'
+import UseCasesMock from '../../../mocks/use-cases/index.js'
 
 // const app = require('../../../mocks/app-mock')
 
-import EntryRouter from '../../../../../src/controllers/rest-api/entry'
+import EntryRouter from '../../../../../src/controllers/rest-api/entry/index.js'
 
 let uut
 let sandbox
diff --git a/test/unit/controllers/rest-api/offer/offer.rest.controller.unit.js b/test/unit/controllers/rest-api/offer/offer.rest.controller.unit.js
index b0e6998..dfd86a9 100644
--- a/test/unit/controllers/rest-api/offer/offer.rest.controller.unit.js
+++ b/test/unit/controllers/rest-api/offer/offer.rest.controller.unit.js
@@ -4,19 +4,14 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
 // Local support libraries
-import adapters from '../../../mocks/adapters'
+import adapters from '../../../mocks/adapters/index.js'
+import UseCasesMock from '../../../mocks/use-cases/index.js'
+import OfferRESTController from '../../../../../src/controllers/rest-api/offer/controller.js'
 
-import UseCasesMock from '../../../mocks/use-cases'
-
-// const app = require('../../../mocks/app-mock')
-
-import OfferRESTController from '../../../../../src/controllers/rest-api/offer/controller'
-
-import { context as mockContext } from '../../../../unit/mocks/ctx-mock'
+import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
 
 let uut
 let sandbox
diff --git a/test/unit/controllers/rest-api/offer/offer.rest.router.unit.js b/test/unit/controllers/rest-api/offer/offer.rest.router.unit.js
index 129adc5..96c0db5 100644
--- a/test/unit/controllers/rest-api/offer/offer.rest.router.unit.js
+++ b/test/unit/controllers/rest-api/offer/offer.rest.router.unit.js
@@ -4,17 +4,12 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
 // Local support libraries
-import adapters from '../../../mocks/adapters'
-
-import UseCasesMock from '../../../mocks/use-cases'
-
-// const app = require('../../../mocks/app-mock')
-
-import OfferRouter from '../../../../../src/controllers/rest-api/offer'
+import adapters from '../../../mocks/adapters/index.js'
+import UseCasesMock from '../../../mocks/use-cases/index.js'
+import OfferRouter from '../../../../../src/controllers/rest-api/offer/index.js'
 
 let uut
 let sandbox
diff --git a/test/unit/controllers/rest-api/order/order.rest.controller.unit.js b/test/unit/controllers/rest-api/order/order.rest.controller.unit.js
index 210aa19..1b70732 100644
--- a/test/unit/controllers/rest-api/order/order.rest.controller.unit.js
+++ b/test/unit/controllers/rest-api/order/order.rest.controller.unit.js
@@ -4,19 +4,14 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
 // Local support libraries
-import adapters from '../../../mocks/adapters'
+import adapters from '../../../mocks/adapters/index.js'
+import UseCasesMock from '../../../mocks/use-cases/index.js'
+import OrderRESTController from '../../../../../src/controllers/rest-api/order/controller.js'
 
-import UseCasesMock from '../../../mocks/use-cases'
-
-// const app = require('../../../mocks/app-mock')
-
-import OrderRESTController from '../../../../../src/controllers/rest-api/order/controller'
-
-import { context as mockContext } from '../../../../unit/mocks/ctx-mock'
+import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
 
 let uut
 let sandbox
diff --git a/test/unit/controllers/rest-api/order/order.rest.router.unit.js b/test/unit/controllers/rest-api/order/order.rest.router.unit.js
index 13861b9..3abeede 100644
--- a/test/unit/controllers/rest-api/order/order.rest.router.unit.js
+++ b/test/unit/controllers/rest-api/order/order.rest.router.unit.js
@@ -4,17 +4,12 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
 // Local support libraries
-import adapters from '../../../mocks/adapters'
-
-import UseCasesMock from '../../../mocks/use-cases'
-
-// const app = require('../../../mocks/app-mock')
-
-import OrderRouter from '../../../../../src/controllers/rest-api/order'
+import adapters from '../../../mocks/adapters/index.js'
+import UseCasesMock from '../../../mocks/use-cases/index.js'
+import OrderRouter from '../../../../../src/controllers/rest-api/order/index.js'
 
 let uut
 let sandbox
diff --git a/test/unit/entities/entry.entity.unit.js b/test/unit/entities/entry.entity.unit.js
index afc6ec8..6982720 100644
--- a/test/unit/entities/entry.entity.unit.js
+++ b/test/unit/entities/entry.entity.unit.js
@@ -3,9 +3,9 @@
 */
 
 import { assert } from 'chai'
-
 import sinon from 'sinon'
-import Entry from '../../../src/entities/entry'
+
+import Entry from '../../../src/entities/entry.js'
 
 let sandbox
 let uut
diff --git a/test/unit/entities/offer.entity.unit.js b/test/unit/entities/offer.entity.unit.js
index aec8f76..51af24d 100644
--- a/test/unit/entities/offer.entity.unit.js
+++ b/test/unit/entities/offer.entity.unit.js
@@ -3,9 +3,9 @@
 */
 
 import { assert } from 'chai'
-
 import sinon from 'sinon'
-import Offer from '../../../src/entities/offer'
+
+import Offer from '../../../src/entities/offer.js'
 
 let sandbox
 let uut
diff --git a/test/unit/entities/order.entity.unit.js b/test/unit/entities/order.entity.unit.js
index 14aec85..9322377 100644
--- a/test/unit/entities/order.entity.unit.js
+++ b/test/unit/entities/order.entity.unit.js
@@ -3,9 +3,9 @@
 */
 
 import { assert } from 'chai'
-
 import sinon from 'sinon'
-import Order from '../../../src/entities/order'
+
+import Order from '../../../src/entities/order.js'
 
 let sandbox
 let uut
diff --git a/test/unit/entities/user.entity.unit.js b/test/unit/entities/user.entity.unit.js
index 4ef6de9..10ee725 100644
--- a/test/unit/entities/user.entity.unit.js
+++ b/test/unit/entities/user.entity.unit.js
@@ -3,8 +3,8 @@
 */
 
 import { assert } from 'chai'
-
 import sinon from 'sinon'
+
 import User from '../../../src/entities/user.js'
 
 let sandbox
diff --git a/test/unit/misc/config.js b/test/unit/misc/config-unit.js
similarity index 86%
rename from test/unit/misc/config.js
rename to test/unit/misc/config-unit.js
index 6a55b7e..2371d80 100644
--- a/test/unit/misc/config.js
+++ b/test/unit/misc/config-unit.js
@@ -9,16 +9,18 @@ let currentEnv
 describe('#config', () => {
   before(() => {
     // Backup the current environment setting.
-    currentEnv = process.env.SVC_ENV
+    currentEnv = process.env.BCH_DEX
   })
 
   after(() => {
     // Restore the environment setting before starting these tests.
-    process.env.SVC_ENV = currentEnv
+    process.env.BCH_DEX = currentEnv
   })
 
   it('Should return development environment config by default', async () => {
-    const importedConfig = await import('../../../config/index.js')
+    process.env.BCH_DEX = 'dev'
+
+    const importedConfig = await import('../../../config/index.js?foo=bar3')
     const config = importedConfig.default
     // console.log('config: ', config)
 
@@ -29,7 +31,7 @@ describe('#config', () => {
     // Hack to dynamically import a library multiple times:
     // https://github.com/denoland/deno/issues/6946
 
-    process.env.SVC_ENV = 'test'
+    process.env.BCH_DEX = 'test'
 
     const importedConfig2 = await import('../../../config/index.js?foo=bar1')
     const config = importedConfig2.default
@@ -39,7 +41,7 @@ describe('#config', () => {
   })
 
   it('Should return test environment config', async () => {
-    process.env.SVC_ENV = 'prod'
+    process.env.BCH_DEX = 'prod'
 
     const importedConfig3 = await import('../../../config/index.js?foo=bar2')
     const config = importedConfig3.default
diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js
index 0702e6a..9ca23f8 100644
--- a/test/unit/mocks/adapters/index.js
+++ b/test/unit/mocks/adapters/index.js
@@ -130,7 +130,7 @@ const bch = {
 //   burnPsf: async () => {},
 //   generateSignature: async () => {}
 // }
-import { MockBchWallet } from './wallet';
+import { MockBchWallet } from './wallet.js';
 
 const wallet = {
   burnPsf: async () => {
diff --git a/test/unit/mocks/adapters/wallet.js b/test/unit/mocks/adapters/wallet.js
index 2f677b5..1b4acb0 100644
--- a/test/unit/mocks/adapters/wallet.js
+++ b/test/unit/mocks/adapters/wallet.js
@@ -141,4 +141,4 @@ class MockBchWallet {
   }
 }
 
-export default { MockBchWallet, mockWallet};
+export { MockBchWallet, mockWallet};
diff --git a/test/unit/use-cases/entry.use-case.unit.js b/test/unit/use-cases/entry.use-case.unit.js
index 3e9f4c5..a477946 100644
--- a/test/unit/use-cases/entry.use-case.unit.js
+++ b/test/unit/use-cases/entry.use-case.unit.js
@@ -1,15 +1,12 @@
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
-// Local support libraries
-// const testUtils = require('../../utils/test-utils')
+// Local libraries
+import adapters from '../mocks/adapters/index.js'
 
 // Unit under test (uut)
-import EntryLib from '../../../src/use-cases/entry'
-
-import adapters from '../mocks/adapters'
+import EntryLib from '../../../src/use-cases/entry.js'
 
 describe('#entry-use-case', () => {
   let uut
diff --git a/test/unit/use-cases/index.use-case.unit.js b/test/unit/use-cases/index.use-case.unit.js
index a7eba11..7299eee 100644
--- a/test/unit/use-cases/index.use-case.unit.js
+++ b/test/unit/use-cases/index.use-case.unit.js
@@ -4,17 +4,14 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
-// Local support libraries
-// const testUtils = require('../../utils/test-utils')
+// Local libraries
+import adapters from '../mocks/adapters/index.js'
 
 // Unit under test (uut)
 import UseCases from '../../../src/use-cases/index.js'
 
-import adapters from '../mocks/adapters/index.js'
-
 describe('#use-cases', () => {
   let uut
   let sandbox
diff --git a/test/unit/use-cases/offer.use-case.unit.js b/test/unit/use-cases/offer.use-case.unit.js
index 4206c68..1203a4d 100644
--- a/test/unit/use-cases/offer.use-case.unit.js
+++ b/test/unit/use-cases/offer.use-case.unit.js
@@ -4,17 +4,16 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
 // Local support libraries
 // const testUtils = require('../../utils/test-utils')
 
 // Unit under test (uut)
-import OfferLib from '../../../src/use-cases/offer'
+import OfferLib from '../../../src/use-cases/offer/index.js'
 
-import OrderUseCase from '../../../src/use-cases/order'
-import adapters from '../mocks/adapters'
+import OrderUseCase from '../../../src/use-cases/order.js'
+import adapters from '../mocks/adapters/index.js'
 import mockData from '../mocks/use-cases/offer-mock-data.js'
 
 describe('#offer-use-case', () => {
diff --git a/test/unit/use-cases/order.use-case.unit.js b/test/unit/use-cases/order.use-case.unit.js
index 85c35ea..c0ea860 100644
--- a/test/unit/use-cases/order.use-case.unit.js
+++ b/test/unit/use-cases/order.use-case.unit.js
@@ -4,16 +4,13 @@
 
 // Public npm libraries
 import { assert } from 'chai'
-
 import sinon from 'sinon'
 
-// Local support libraries
-// const testUtils = require('../../utils/test-utils')
-
 // Unit under test (uut)
-import OrderLib from '../../../src/use-cases/order'
+import OrderLib from '../../../src/use-cases/order.js'
 
-import adapters from '../mocks/adapters'
+// Local support libraries
+import adapters from '../mocks/adapters/index.js'
 
 describe('#order-use-case', () => {
   let uut
diff --git a/test/unit/use-cases/users.use-case.unit.js b/test/unit/use-cases/users.use-case.unit.js
index a73ed24..c34e677 100644
--- a/test/unit/use-cases/users.use-case.unit.js
+++ b/test/unit/use-cases/users.use-case.unit.js
@@ -8,12 +8,10 @@
 import { assert } from 'chai'
 import sinon from 'sinon'
 
-// Local support libraries
-// const testUtils = require('../../utils/test-utils')
-
 // Unit under test (uut)
 import UserLib from '../../../src/use-cases/user.js'
 
+// Local support libraries
 import adapters from '../mocks/adapters/index.js'
 
 describe('#users-use-case', () => {