diff --git a/package.json b/package.json
index 9042eb4..84eb6de 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,11 @@
   "main": "index.js",
   "scripts": {
     "start": "node index.js",
-    "test": "export KOA_ENV=test && npm run prep-test && nyc --reporter=text --timeout 15000 ./node_modules/.bin/mocha --exit",
+    "test": "export KOA_ENV=test && npm run prep-test && nyc --reporter=text mocha --exit --timeout 15000 test/unit/",
     "lint": "standard --env mocha --fix",
     "docs": "./node_modules/.bin/apidoc -i src/ -o docs",
     "coverage": "export KOA_ENV=test && npm run prep-test && nyc report --reporter=text-lcov | coveralls",
-    "coverage:report": "export KOA_ENV=test && npm run prep-test && nyc --reporter=html mocha --exit",
+    "coverage:report": "export KOA_ENV=test && npm run prep-test && nyc --reporter=html mocha --exit --timeout 15000 test/unit/",
     "prep-test": "node util/users/delete-all-test-users.js"
   },
   "keywords": [
diff --git a/src/modules/users/controller.js b/src/modules/users/controller.js
index 1daa1ac..47418b6 100644
--- a/src/modules/users/controller.js
+++ b/src/modules/users/controller.js
@@ -89,6 +89,8 @@ class UserController {
         token
       }
     } catch (err) {
+      // console.log(`err.message: ${err.message}`)
+      // console.log('err: ', err)
       ctx.throw(422, err.message)
     }
   }
diff --git a/test/README.md b/test/unit/README.md
similarity index 100%
rename from test/README.md
rename to test/unit/README.md
diff --git a/test/a01-auth.spec.js b/test/unit/a01-auth.spec.js
similarity index 97%
rename from test/a01-auth.spec.js
rename to test/unit/a01-auth.spec.js
index 8300b43..706c846 100644
--- a/test/a01-auth.spec.js
+++ b/test/unit/a01-auth.spec.js
@@ -1,6 +1,6 @@
-const app = require('../bin/server')
+const app = require('../../bin/server')
 const utils = require('./utils')
-const config = require('../config')
+const config = require('../../config')
 const assert = require('chai').assert
 
 const axios = require('axios').default
diff --git a/test/a02-users.spec.js b/test/unit/a02-users.spec.js
similarity index 99%
rename from test/a02-users.spec.js
rename to test/unit/a02-users.spec.js
index 8176537..774fca1 100644
--- a/test/a02-users.spec.js
+++ b/test/unit/a02-users.spec.js
@@ -1,6 +1,6 @@
 const testUtils = require('./utils')
 const assert = require('chai').assert
-const config = require('../config')
+const config = require('../../config')
 const axios = require('axios').default
 const sinon = require('sinon')
 
@@ -11,7 +11,7 @@ const LOCALHOST = `http://localhost:${config.port}`
 
 const context = {}
 
-const UserController = require('../src/modules/users/controller')
+const UserController = require('../../src/modules/users/controller')
 let uut
 let sandbox
 
diff --git a/test/a03-nodemailer.spec.js b/test/unit/a03-nodemailer.spec.js
similarity index 99%
rename from test/a03-nodemailer.spec.js
rename to test/unit/a03-nodemailer.spec.js
index cc31e74..838bd2a 100644
--- a/test/a03-nodemailer.spec.js
+++ b/test/unit/a03-nodemailer.spec.js
@@ -1,6 +1,6 @@
 const assert = require('chai').assert
 
-const NodeMailer = require('../src/lib/nodemailer')
+const NodeMailer = require('../../src/lib/nodemailer')
 
 const sinon = require('sinon')
 
diff --git a/test/a04-contact.spec.js b/test/unit/a04-contact.spec.js
similarity index 98%
rename from test/a04-contact.spec.js
rename to test/unit/a04-contact.spec.js
index 0e3d44e..2197cde 100644
--- a/test/a04-contact.spec.js
+++ b/test/unit/a04-contact.spec.js
@@ -1,4 +1,4 @@
-const config = require('../config')
+const config = require('../../config')
 const axios = require('axios').default
 const assert = require('chai').assert
 const sinon = require('sinon')
@@ -9,7 +9,7 @@ const sinon = require('sinon')
 const LOCALHOST = `http://localhost:${config.port}`
 
 const mockContext = require('./mocks/ctx-mock').context
-const ContactController = require('../src/modules/contact/controller')
+const ContactController = require('../../src/modules/contact/controller')
 let uut
 let sandbox
 
diff --git a/test/a05-passport.spec.js b/test/unit/a05-passport.spec.js
similarity index 95%
rename from test/a05-passport.spec.js
rename to test/unit/a05-passport.spec.js
index 879d66c..52ad972 100644
--- a/test/a05-passport.spec.js
+++ b/test/unit/a05-passport.spec.js
@@ -1,5 +1,5 @@
 const assert = require('chai').assert
-const PassportLib = require('../src/lib/passport')
+const PassportLib = require('../../src/lib/passport')
 
 const sinon = require('sinon')
 
diff --git a/test/a06-logapi.spec.js b/test/unit/a06-logapi.spec.js
similarity index 98%
rename from test/a06-logapi.spec.js
rename to test/unit/a06-logapi.spec.js
index a4c14b9..9705f0b 100644
--- a/test/a06-logapi.spec.js
+++ b/test/unit/a06-logapi.spec.js
@@ -1,4 +1,4 @@
-const config = require('../config')
+const config = require('../../config')
 const assert = require('chai').assert
 
 const axios = require('axios').default
@@ -9,7 +9,7 @@ util.inspect.defaultOptions = { depth: 1 }
 
 const LOCALHOST = `http://localhost:${config.port}`
 
-const LogsController = require('../src/modules/logapi/controller')
+const LogsController = require('../../src/modules/logapi/controller')
 const mockContext = require('./mocks/ctx-mock').context
 const mockData = require('./mocks/log-api-mock')
 
diff --git a/test/a07-json-files.spec.js b/test/unit/a07-json-files.spec.js
similarity index 98%
rename from test/a07-json-files.spec.js
rename to test/unit/a07-json-files.spec.js
index 850cf76..1c19065 100644
--- a/test/a07-json-files.spec.js
+++ b/test/unit/a07-json-files.spec.js
@@ -5,7 +5,7 @@ const sinon = require('sinon')
 const util = require('util')
 util.inspect.defaultOptions = { depth: 1 }
 
-const JsonFiles = require('../src/lib/utils/json-files')
+const JsonFiles = require('../../src/lib/utils/json-files')
 
 const JSON_FILE = 'test-json-file.json'
 const JSON_PATH = `${__dirname}/${JSON_FILE}`
diff --git a/test/a08-validators.spec.js b/test/unit/a08-validators.spec.js
similarity index 99%
rename from test/a08-validators.spec.js
rename to test/unit/a08-validators.spec.js
index b957fbb..a1ea23f 100644
--- a/test/a08-validators.spec.js
+++ b/test/unit/a08-validators.spec.js
@@ -1,7 +1,7 @@
 const assert = require('chai').assert
 const testUtils = require('./utils')
 
-const Validators = require('../src/middleware/validators')
+const Validators = require('../../src/middleware/validators')
 
 const sinon = require('sinon')
 const mockContext = require('./mocks/ctx-mock').context
diff --git a/test/a09-admin.spec.js b/test/unit/a09-admin.spec.js
similarity index 98%
rename from test/a09-admin.spec.js
rename to test/unit/a09-admin.spec.js
index ceb1c96..477a340 100644
--- a/test/a09-admin.spec.js
+++ b/test/unit/a09-admin.spec.js
@@ -1,6 +1,6 @@
 const assert = require('chai').assert
 
-const Admin = require('../src/lib/admin')
+const Admin = require('../../src/lib/admin')
 
 const sinon = require('sinon')
 
diff --git a/test/mocks/ctx-mock.js b/test/unit/mocks/ctx-mock.js
similarity index 100%
rename from test/mocks/ctx-mock.js
rename to test/unit/mocks/ctx-mock.js
diff --git a/test/mocks/log-api-mock.js b/test/unit/mocks/log-api-mock.js
similarity index 100%
rename from test/mocks/log-api-mock.js
rename to test/unit/mocks/log-api-mock.js
diff --git a/test/utils.js b/test/unit/utils.js
similarity index 94%
rename from test/utils.js
rename to test/unit/utils.js
index 821d6f5..91cc79a 100644
--- a/test/utils.js
+++ b/test/unit/utils.js
@@ -1,5 +1,5 @@
 const mongoose = require('mongoose')
-const config = require('../config')
+const config = require('../../config')
 const axios = require('axios').default
 
 const LOCALHOST = `http://localhost:${config.port}`
@@ -79,7 +79,7 @@ async function loginTestUser () {
 
 async function loginAdminUser () {
   try {
-    const FILENAME = `../config/system-user-${config.env}.json`
+    const FILENAME = `../../config/system-user-${config.env}.json`
     const adminUserData = require(FILENAME)
     console.log(`adminUserData: ${JSON.stringify(adminUserData, null, 2)}`)
 
@@ -115,7 +115,7 @@ async function getAdminJWT () {
     // process.env.KOA_ENV = process.env.KOA_ENV || 'dev'
     // console.log(`env: ${process.env.KOA_ENV}`)
 
-    const FILENAME = `../config/system-user-${config.env}.json`
+    const FILENAME = `../../config/system-user-${config.env}.json`
     const adminUserData = require(FILENAME)
     // console.log(`adminUserData: ${JSON.stringify(adminUserData, null, 2)}`)
 
diff --git a/util/users/delete-all-test-users.js b/util/users/delete-all-test-users.js
index eec1b32..9d61994 100644
--- a/util/users/delete-all-test-users.js
+++ b/util/users/delete-all-test-users.js
@@ -29,4 +29,5 @@ async function deleteUsers () {
 
   mongoose.connection.close()
 }
+
 deleteUsers()