diff --git a/test/unit-tests/user/userGetAllTest.js b/test/unit-tests/user/userGetAllTest.js
index 1c0be0c1e..7d3441212 100644
--- a/test/unit-tests/user/userGetAllTest.js
+++ b/test/unit-tests/user/userGetAllTest.js
@@ -17,7 +17,7 @@ const orgFixtures = require('./mockObjects.user')
 const orgController = require('../../../src/controller/org.controller/org.controller')
 const orgParams = require('../../../src/controller/org.controller/org.middleware')
 
-describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller', () => {
+describe('Testing the GET /org/:shortname/users endpoint in Org Controller', () => {
   context('Negative Tests', () => {
     it('should return 404 not found because org does not exist', (done) => {
       class NoOrg {
@@ -25,7 +25,7 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return null
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return false
         }
       }
@@ -39,8 +39,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
       app.route('/org-does-not-exist/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new NoOrg() },
-            getUserRepository: () => { return new Blank() }
+            getBaseOrgRepository: () => { return new NoOrg() },
+            getBaseUserRepository: () => { return new Blank() }
           }
           req.ctx.repositories = factory
           next()
@@ -69,7 +69,7 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return 'not-an-org'
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return false
         }
       }
@@ -83,8 +83,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
       app.route('/requester-does-not-belong/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new NotSameOrg() },
-            getUserRepository: () => { return new Blank() }
+            getBaseOrgRepository: () => { return new NotSameOrg() },
+            getBaseUserRepository: () => { return new Blank() }
           }
           req.ctx.repositories = factory
           next()
@@ -115,34 +115,23 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return orgFixtures.owningOrg.UUID
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return false
         }
       }
 
-      class GetAllOrgUsers {
-        async aggregatePaginate () {
-          const res = {
-            itemsList: [orgFixtures.existentUserDummy],
-            itemCount: 1,
-            itemsPerPage: 1000,
-            currentPage: 1,
-            pageCount: 1,
-            pagingCounter: 1,
-            hasPrevPage: false,
-            hasNextPage: false,
-            prevPage: null,
-            nextPage: null
+      class GetAllUsersByOrgShortname {
+        async getAllUsersByOrgShortname () {
+          return {
+            users: [orgFixtures.existentUserDummy]
           }
-          return res
         }
       }
-
       app.route('/user-list-returned-same-org/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new GetOrgUUID() },
-            getUserRepository: () => { return new GetAllOrgUsers() }
+            getBaseOrgRepository: () => { return new GetOrgUUID() },
+            getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() }
           }
           req.ctx.repositories = factory
           next()
@@ -170,34 +159,24 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return orgFixtures.owningOrg.UUID
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return true
         }
       }
 
-      class GetAllOrgUsers {
-        async aggregatePaginate () {
-          const res = {
-            itemsList: [orgFixtures.existentUserDummy],
-            itemCount: 1,
-            itemsPerPage: 1000,
-            currentPage: 1,
-            pageCount: 1,
-            pagingCounter: 1,
-            hasPrevPage: false,
-            hasNextPage: false,
-            prevPage: null,
-            nextPage: null
+      class GetAllUsersByOrgShortname {
+        async getAllUsersByOrgShortname () {
+          return {
+            users: [orgFixtures.existentUserDummy]
           }
-          return res
         }
       }
 
       app.route('/user-list-returned-secretariat/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new GetOrgUUID() },
-            getUserRepository: () => { return new GetAllOrgUsers() }
+            getBaseOrgRepository: () => { return new GetOrgUUID() },
+            getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() }
           }
           req.ctx.repositories = factory
           next()
@@ -225,34 +204,23 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return orgFixtures.owningOrg.UUID
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return false
         }
       }
 
-      class GetAllOrgUsers {
-        async aggregatePaginate () {
-          const res = {
-            itemsList: orgFixtures.allOwningOrgUsers,
-            itemCount: orgFixtures.allOwningOrgUsers.length,
-            itemsPerPage: 500,
-            currentPage: 1,
-            pageCount: 1,
-            pagingCounter: 1,
-            hasPrevPage: false,
-            hasNextPage: false,
-            prevPage: null,
-            nextPage: null
-          }
-          return res
+      class GetAllUsersByOrgShortname {
+        async getAllUsersByOrgShortname () {
+          const payload = { users: orgFixtures.allOwningOrgUsers }
+          return payload
         }
       }
 
       app.route('/user-list-returned-not-secretariat-limit-default/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new GetOrgUUID() },
-            getUserRepository: () => { return new GetAllOrgUsers() }
+            getBaseOrgRepository: () => { return new GetOrgUUID() },
+            getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() }
           }
           req.ctx.repositories = factory
           next()
@@ -282,34 +250,33 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return orgFixtures.owningOrg.UUID
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return false
         }
       }
 
-      class GetAllOrgUsers {
-        async aggregatePaginate () {
-          const res = {
-            itemsList: [orgFixtures.allOwningOrgUsers[0], orgFixtures.allOwningOrgUsers[1], orgFixtures.allOwningOrgUsers[2]],
-            itemCount: orgFixtures.allOwningOrgUsers.length,
-            itemsPerPage: itemsPerPage,
-            currentPage: 1,
-            pageCount: 2,
-            pagingCounter: 1,
-            hasPrevPage: false,
-            hasNextPage: true,
-            prevPage: null,
-            nextPage: 2
-          }
-          return res
+      class GetAllUsersByOrgShortname {
+        async getAllUsersByOrgShortname () {
+          const payload = { users: [orgFixtures.allOwningOrgUsers[0], orgFixtures.allOwningOrgUsers[1], orgFixtures.allOwningOrgUsers[2]] }
+          payload.totalCount = orgFixtures.allOwningOrgUsers.length
+          payload.itemsPerPage = 3
+          payload.pageCount = 2
+          payload.currentPage = 1
+          payload.pagingCounter = 1
+          payload.hasPrevPage = false
+          payload.hasNextPage = true
+          payload.prevPage = null
+          payload.nextPage = 2
+
+          return payload
         }
       }
 
       app.route('/user-list-returned-not-secretariat-limit-3-1/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new GetOrgUUID() },
-            getUserRepository: () => { return new GetAllOrgUsers() }
+            getBaseOrgRepository: () => { return new GetOrgUUID() },
+            getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() }
           }
           req.ctx.repositories = factory
           // temporary fix for #920: force pagnation
@@ -339,34 +306,33 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return orgFixtures.owningOrg.UUID
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return false
         }
       }
 
-      class GetAllOrgUsers {
-        async aggregatePaginate () {
-          const res = {
-            itemsList: [orgFixtures.allOwningOrgUsers[3], orgFixtures.allOwningOrgUsers[4]],
-            itemCount: orgFixtures.allOwningOrgUsers.length,
-            itemsPerPage: 3,
-            currentPage: 2,
-            pageCount: 2,
-            pagingCounter: 1,
-            hasPrevPage: true,
-            hasNextPage: false,
-            prevPage: 1,
-            nextPage: null
-          }
-          return res
+      class GetAllUsersByOrgShortname {
+        async getAllUsersByOrgShortname () {
+          const payload = { users: [orgFixtures.allOwningOrgUsers[3], orgFixtures.allOwningOrgUsers[4]] }
+          payload.totalCount = orgFixtures.allOwningOrgUsers.length
+          payload.itemsPerPage = 3
+          payload.pageCount = 2
+          payload.currentPage = 2
+          payload.pagingCounter = 1
+          payload.hasPrevPage = true
+          payload.hasNextPage = false
+          payload.prevPage = 1
+          payload.nextPage = null
+
+          return payload
         }
       }
 
       app.route('/user-list-returned-not-secretariat-limit-3-2/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new GetOrgUUID() },
-            getUserRepository: () => { return new GetAllOrgUsers() }
+            getBaseOrgRepository: () => { return new GetOrgUUID() },
+            getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() }
           }
           req.ctx.repositories = factory
           // temporary fix for #920: force pagnation
@@ -396,34 +362,23 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller'
           return orgFixtures.owningOrg.UUID
         }
 
-        async isSecretariat () {
+        async isSecretariatByShortName () {
           return false
         }
       }
 
-      class GetAllOrgUsers {
-        async aggregatePaginate () {
-          const res = {
-            itemsList: [],
-            itemCount: 0,
-            itemsPerPage: 500,
-            currentPage: 1,
-            pageCount: 1,
-            pagingCounter: 1,
-            hasPrevPage: false,
-            hasNextPage: false,
-            prevPage: null,
-            nextPage: null
-          }
-          return res
+      class GetAllUsersByOrgShortname {
+        async getAllUsersByOrgShortname () {
+          const payload = { users: [] }
+          return payload
         }
       }
 
       app.route('/user-list-no-users/:shortname/users')
         .get((req, res, next) => {
           const factory = {
-            getOrgRepository: () => { return new GetOrgUUID() },
-            getUserRepository: () => { return new GetAllOrgUsers() }
+            getBaseOrgRepository: () => { return new GetOrgUUID() },
+            getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() }
           }
           req.ctx.repositories = factory
           next()