diff --git a/test/api/mocha/asset/DeleteAccess.test.js b/test/api/mocha/authentication/asset/DeleteAccess.test.js
similarity index 98%
rename from test/api/mocha/asset/DeleteAccess.test.js
rename to test/api/mocha/authentication/asset/DeleteAccess.test.js
index dfac2205..84f1dccf 100644
--- a/test/api/mocha/asset/DeleteAccess.test.js
+++ b/test/api/mocha/authentication/asset/DeleteAccess.test.js
@@ -5,7 +5,7 @@ const expect = chai.expect
 const config = require('../testConfig.json')
 const utils = require('../utils/testUtils')
 const assetEnv = require('../assetEnv.json')
-const usersEnv = require('./users.json')
+const usersEnv = require('../../data/asset/users.json')
 
 
 describe('Asset delete Access Control tests admin user', () => {
diff --git a/test/api/mocha/asset/GetsAccess.test.js b/test/api/mocha/authentication/asset/GetsAccess.test.js
similarity index 99%
rename from test/api/mocha/asset/GetsAccess.test.js
rename to test/api/mocha/authentication/asset/GetsAccess.test.js
index d83bdb8c..fdd36949 100644
--- a/test/api/mocha/asset/GetsAccess.test.js
+++ b/test/api/mocha/authentication/asset/GetsAccess.test.js
@@ -2,7 +2,7 @@ const chai = require('chai')
 const chaiHttp = require('chai-http')
 chai.use(chaiHttp)
 const expect = chai.expect
-const usersEnv = require('./users.json')
+const usersEnv = require('../../data/asset/users.json')
 const config = require('../testConfig.json')
 const utils = require('../utils/testUtils')
 const assetEnv = require('../assetEnv.json')
diff --git a/test/api/mocha/asset/PatchAccess.test.js b/test/api/mocha/authentication/asset/PatchAccess.test.js
similarity index 99%
rename from test/api/mocha/asset/PatchAccess.test.js
rename to test/api/mocha/authentication/asset/PatchAccess.test.js
index 2c05e675..7005a26a 100644
--- a/test/api/mocha/asset/PatchAccess.test.js
+++ b/test/api/mocha/authentication/asset/PatchAccess.test.js
@@ -5,7 +5,7 @@ const expect = chai.expect
 const config = require('../testConfig.json')
 const utils = require('../utils/testUtils')
 const assetEnv = require('../assetEnv.json')
-const usersEnv = require('./users.json')
+const usersEnv = require('../../data/asset/users.json')
 
 describe('Access Control Testing Asset Patch ', () => {
     before(async function () {
diff --git a/test/api/mocha/asset/PostsAccess.test.js b/test/api/mocha/authentication/asset/PostsAccess.test.js
similarity index 94%
rename from test/api/mocha/asset/PostsAccess.test.js
rename to test/api/mocha/authentication/asset/PostsAccess.test.js
index 92e1b75e..4355b022 100644
--- a/test/api/mocha/asset/PostsAccess.test.js
+++ b/test/api/mocha/authentication/asset/PostsAccess.test.js
@@ -2,10 +2,10 @@ const chai = require('chai')
 const chaiHttp = require('chai-http')
 chai.use(chaiHttp)
 const expect = chai.expect
-const config = require('../testConfig.json')
-const utils = require('../utils/testUtils')
-const assetEnv = require('../assetEnv.json')
-const usersEnv = require('./users.json')
+const config = require('../../testConfig.json')
+const utils = require('../../utils/testUtils')
+const assetEnv = require('../../assetEnv.json')
+const usersEnv = require('../../data/asset/users.json')
 
 describe('Access Control Testing Asset posts', () => {
   before(async function () {
diff --git a/test/api/mocha/asset/PutsAccess.test.js b/test/api/mocha/authentication/asset/PutsAccess.test.js
similarity index 99%
rename from test/api/mocha/asset/PutsAccess.test.js
rename to test/api/mocha/authentication/asset/PutsAccess.test.js
index e0cc7a4c..1cfed83f 100644
--- a/test/api/mocha/asset/PutsAccess.test.js
+++ b/test/api/mocha/authentication/asset/PutsAccess.test.js
@@ -5,7 +5,7 @@ const expect = chai.expect
 const config = require('../testConfig.json')
 const utils = require('../utils/testUtils')
 const assetEnv = require('../assetEnv.json')
-const usersEnv = require('./users.json')
+const usersEnv = require('../../data/asset/users.json')
 
 describe('Asset PUT tests', () => {
 
diff --git a/test/api/mocha/users/usersAccess.test.js b/test/api/mocha/authentication/users/usersAccess.test.js
similarity index 99%
rename from test/api/mocha/users/usersAccess.test.js
rename to test/api/mocha/authentication/users/usersAccess.test.js
index 2a23eb60..47a7996e 100644
--- a/test/api/mocha/users/usersAccess.test.js
+++ b/test/api/mocha/authentication/users/usersAccess.test.js
@@ -5,7 +5,7 @@ const expect = chai.expect
 const config = require('../testConfig.json')
 const utils = require('../utils/testUtils')
 const userEnv = require('../usersEnv.json')
-const testUsers = require('./users.json')
+const testUsers = require('../../data/users/users.json')
 
 describe('User GETS tests using "admin" user ', () => {
   before(async function () {
diff --git a/test/api/mocha/asset/Delete.test.js b/test/api/mocha/data/asset/Delete.test.js
similarity index 97%
rename from test/api/mocha/asset/Delete.test.js
rename to test/api/mocha/data/asset/Delete.test.js
index b6142871..1b93f9aa 100644
--- a/test/api/mocha/asset/Delete.test.js
+++ b/test/api/mocha/data/asset/Delete.test.js
@@ -2,9 +2,9 @@ const chai = require('chai')
 const chaiHttp = require('chai-http')
 chai.use(chaiHttp)
 const expect = chai.expect
-const config = require('../testConfig.json')
-const utils = require('../utils/testUtils')
-const assetEnv = require('../assetEnv.json')
+const config = require('../../testConfig.json')
+const utils = require('../../utils/testUtils')
+const assetEnv = require('../../assetEnv.json')
 
 const user =
   {
diff --git a/test/api/mocha/asset/Gets.test.js b/test/api/mocha/data/asset/Gets.test.js
similarity index 100%
rename from test/api/mocha/asset/Gets.test.js
rename to test/api/mocha/data/asset/Gets.test.js
diff --git a/test/api/mocha/asset/Patch.test.js b/test/api/mocha/data/asset/Patch.test.js
similarity index 100%
rename from test/api/mocha/asset/Patch.test.js
rename to test/api/mocha/data/asset/Patch.test.js
diff --git a/test/api/mocha/asset/Posts.test.js b/test/api/mocha/data/asset/Posts.test.js
similarity index 100%
rename from test/api/mocha/asset/Posts.test.js
rename to test/api/mocha/data/asset/Posts.test.js
diff --git a/test/api/mocha/asset/Puts.test.js b/test/api/mocha/data/asset/Puts.test.js
similarity index 100%
rename from test/api/mocha/asset/Puts.test.js
rename to test/api/mocha/data/asset/Puts.test.js
diff --git a/test/api/mocha/asset/users.json b/test/api/mocha/data/asset/users.json
similarity index 100%
rename from test/api/mocha/asset/users.json
rename to test/api/mocha/data/asset/users.json
diff --git a/test/api/mocha/review/Delete.test.js b/test/api/mocha/data/review/Delete.test.js
similarity index 100%
rename from test/api/mocha/review/Delete.test.js
rename to test/api/mocha/data/review/Delete.test.js
diff --git a/test/api/mocha/review/Gets.test.js b/test/api/mocha/data/review/Gets.test.js
similarity index 100%
rename from test/api/mocha/review/Gets.test.js
rename to test/api/mocha/data/review/Gets.test.js
diff --git a/test/api/mocha/review/Patch.test.js b/test/api/mocha/data/review/Patch.test.js
similarity index 100%
rename from test/api/mocha/review/Patch.test.js
rename to test/api/mocha/data/review/Patch.test.js
diff --git a/test/api/mocha/review/Post.test.js b/test/api/mocha/data/review/Post.test.js
similarity index 100%
rename from test/api/mocha/review/Post.test.js
rename to test/api/mocha/data/review/Post.test.js
diff --git a/test/api/mocha/review/Put.test.js b/test/api/mocha/data/review/Put.test.js
similarity index 100%
rename from test/api/mocha/review/Put.test.js
rename to test/api/mocha/data/review/Put.test.js
diff --git a/test/api/mocha/users/User.test.js b/test/api/mocha/data/users/User.test.js
similarity index 98%
rename from test/api/mocha/users/User.test.js
rename to test/api/mocha/data/users/User.test.js
index aacfd17a..d2ca4cd6 100644
--- a/test/api/mocha/users/User.test.js
+++ b/test/api/mocha/data/users/User.test.js
@@ -2,9 +2,9 @@ const chai = require('chai')
 const chaiHttp = require('chai-http')
 chai.use(chaiHttp)
 const expect = chai.expect
-const config = require('../testConfig.json')
-const utils = require('../utils/testUtils')
-const userEnv = require('../usersEnv.json')
+const config = require('../../testConfig.json')
+const utils = require('../../utils/testUtils')
+const userEnv = require('../../usersEnv.json')
 
 const user =
   {
diff --git a/test/api/mocha/users/users.json b/test/api/mocha/data/users/users.json
similarity index 100%
rename from test/api/mocha/users/users.json
rename to test/api/mocha/data/users/users.json