diff --git a/services/client/common/methods/client/specs/listWorkers.spec.js b/services/client/common/methods/client/specs/listWorkers.spec.js
deleted file mode 100644
index 33222c4d89..0000000000
--- a/services/client/common/methods/client/specs/listWorkers.spec.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const app = require('../../../../server/server');
-const catchErrors = require('../../../../../../services/utils/jasmineHelpers').catchErrors;
-
-describe('Client listWorkers', () => {
-    it('should call the listWorkers()', done => {
-        app.models.Client.listWorkers()
-        .then(result => {
-            let amountOfEmployees = Object.keys(result).length;
-
-            expect(amountOfEmployees).toEqual(6);
-            done();
-        })
-        .catch(catchErrors(done));
-    });
-});
diff --git a/services/client/common/methods/client/specs/salesperson.spec.js b/services/loopback/common/methods/client/specs/activeSalesperson.spec.js
similarity index 93%
rename from services/client/common/methods/client/specs/salesperson.spec.js
rename to services/loopback/common/methods/client/specs/activeSalesperson.spec.js
index a2688c9b47..085c0f3ce4 100644
--- a/services/client/common/methods/client/specs/salesperson.spec.js
+++ b/services/loopback/common/methods/client/specs/activeSalesperson.spec.js
@@ -1,4 +1,4 @@
-const app = require('../../../../server/server');
+const app = require('../../../../../client/server/server');
 const catchErrors = require('../../../../../../services/utils/jasmineHelpers').catchErrors;
 
 describe('Client activeSalesPerson', () => {
diff --git a/services/client/common/methods/client/specs/addressesPropagateRe.spec.js b/services/loopback/common/methods/client/specs/addressesPropagateRe.spec.js
similarity index 93%
rename from services/client/common/methods/client/specs/addressesPropagateRe.spec.js
rename to services/loopback/common/methods/client/specs/addressesPropagateRe.spec.js
index 87a841defc..5034e3f57e 100644
--- a/services/client/common/methods/client/specs/addressesPropagateRe.spec.js
+++ b/services/loopback/common/methods/client/specs/addressesPropagateRe.spec.js
@@ -1,4 +1,4 @@
-const app = require('../../../../server/server');
+const app = require('../../../../../client/server/server');
 const catchErrors = require('../../../../../../services/utils/jasmineHelpers').catchErrors;
 const restoreFixtures = require('../../../../../../services/db/testing_fixtures');
 
@@ -64,21 +64,20 @@ describe('Client addressesPropagateRe', () => {
 
             expect(result).toBe(true);
             app.models.Address.find({where: {clientFk: id}})
-            .then(result => {
-                expect(result[0].isEqualizated).toBeTruthy();
-                expect(result[1].isEqualizated).toBeTruthy();
-                done();
-            });
+                .then(result => {
+                    expect(result[0].isEqualizated).toBeTruthy();
+                    expect(result[1].isEqualizated).toBeTruthy();
+                    done();
+                });
         };
-
         app.models.Address.find({where: {clientFk: id}})
-        .then(result => {
-            expect(result[0].isEqualizated).toBeFalsy();
-            expect(result[1].isEqualizated).toBeFalsy();
-        })
-        .then(() => {
-            app.models.Client.addressesPropagateRe(id, data, callback);
-        })
-        .catch(catchErrors(done));
+            .then(result => {
+                expect(result[0].isEqualizated).toBeFalsy();
+                expect(result[1].isEqualizated).toBeFalsy();
+            })
+            .then(() => {
+                app.models.Client.addressesPropagateRe(id, data, callback);
+            })
+            .catch(catchErrors(done));
     });
 });
diff --git a/services/client/common/methods/client/specs/card.spec.js b/services/loopback/common/methods/client/specs/card.spec.js
similarity index 90%
rename from services/client/common/methods/client/specs/card.spec.js
rename to services/loopback/common/methods/client/specs/card.spec.js
index a7de41776c..1d0697f884 100644
--- a/services/client/common/methods/client/specs/card.spec.js
+++ b/services/loopback/common/methods/client/specs/card.spec.js
@@ -1,4 +1,4 @@
-const app = require('../../../../server/server');
+const app = require('../../../../../client/server/server');
 const catchErrors = require('../../../../../../services/utils/jasmineHelpers').catchErrors;
 
 describe('Client card', () => {
diff --git a/services/client/common/methods/client/specs/createWithUser.spec.js b/services/loopback/common/methods/client/specs/createWithUser.spec.js
similarity index 82%
rename from services/client/common/methods/client/specs/createWithUser.spec.js
rename to services/loopback/common/methods/client/specs/createWithUser.spec.js
index d2981aea23..d84ea5c2fd 100644
--- a/services/client/common/methods/client/specs/createWithUser.spec.js
+++ b/services/loopback/common/methods/client/specs/createWithUser.spec.js
@@ -1,4 +1,4 @@
-const app = require('../../../../server/server');
+const app = require('../../../../../client/server/server');
 const catchErrors = require('../../../../../../services/utils/jasmineHelpers').catchErrors;
 const restoreFixtures = require('../../../../../../services/db/testing_fixtures');
 
@@ -65,64 +65,64 @@ describe('Client Create', () => {
 
     it('should find Charles Xavier', done => {
         app.models.Account.findOne({where: {name: 'CharlesXavier'}})
-        .then(account => {
-            expect(account.name).toEqual('CharlesXavier');
-            done();
-        });
-    });
-
-    it("should not find Deadpool as he's not created yet", done => {
-        app.models.Account.findOne({where: {name: newAccountData.userName}})
-        .then(account => {
-            expect(account).toEqual(null);
-            app.models.Client.findOne({where: {name: newAccountData.name}})
-            .then(client => {
-                expect(client).toEqual(null);
+            .then(account => {
+                expect(account.name).toEqual('CharlesXavier');
                 done();
             });
-        })
-        .catch(catchErrors(done));
+    });
+
+    it(`should not find Deadpool as he's not created yet`, done => {
+        app.models.Account.findOne({where: {name: newAccountData.userName}})
+            .then(account => {
+                expect(account).toEqual(null);
+                app.models.Client.findOne({where: {name: newAccountData.name}})
+                    .then(client => {
+                        expect(client).toEqual(null);
+                        done();
+                    });
+            })
+            .catch(catchErrors(done));
     });
 
     it('should not be able to create a user if exists', done => {
         app.models.Client.findOne({where: {name: 'Charles Xavier'}})
-        .then(client => {
-            app.models.Account.findOne({where: {id: client.id}})
-            .then(account => {
-                let formerAccountData = {
-                    name: client.name,
-                    userName: account.name,
-                    email: client.email,
-                    fi: client.fi,
-                    socialName: client.socialName
-                };
+            .then(client => {
+                app.models.Account.findOne({where: {id: client.id}})
+                    .then(account => {
+                        let formerAccountData = {
+                            name: client.name,
+                            userName: account.name,
+                            email: client.email,
+                            fi: client.fi,
+                            socialName: client.socialName
+                        };
 
-                app.models.Client.createWithUser(formerAccountData, (err, client) => {
-                    expect(err.details.codes.name[0]).toEqual('uniqueness');
-                    done();
-                });
-            });
-        })
-        .catch(catchErrors(done));
+                        app.models.Client.createWithUser(formerAccountData, (err, client) => {
+                            expect(err.details.codes.name[0]).toEqual('uniqueness');
+                            done();
+                        });
+                    });
+            })
+            .catch(catchErrors(done));
     });
 
     it('should create a new account', done => {
         app.models.Client.createWithUser(newAccountData, (error, client) => {
             if (error) return catchErrors(done)(error);
             app.models.Account.findOne({where: {name: newAccountData.userName}})
-            .then(account => {
-                expect(account.name).toEqual(newAccountData.userName);
-                app.models.Client.findOne({where: {name: newAccountData.name}})
-                .then(client => {
-                    expect(client.id).toEqual(account.id);
-                    expect(client.name).toEqual(newAccountData.name);
-                    expect(client.email).toEqual(newAccountData.email);
-                    expect(client.fi).toEqual(newAccountData.fi);
-                    expect(client.socialName).toEqual(newAccountData.socialName);
-                    done();
-                });
-            })
-            .catch(catchErrors(done));
+                .then(account => {
+                    expect(account.name).toEqual(newAccountData.userName);
+                    app.models.Client.findOne({where: {name: newAccountData.name}})
+                        .then(client => {
+                            expect(client.id).toEqual(account.id);
+                            expect(client.name).toEqual(newAccountData.name);
+                            expect(client.email).toEqual(newAccountData.email);
+                            expect(client.fi).toEqual(newAccountData.fi);
+                            expect(client.socialName).toEqual(newAccountData.socialName);
+                            done();
+                        });
+                })
+                .catch(catchErrors(done));
         });
     });
 });
diff --git a/services/client/common/methods/client/specs/hasCustomerRole.spec.js b/services/loopback/common/methods/client/specs/hasCustomerRole.spec.js
similarity index 96%
rename from services/client/common/methods/client/specs/hasCustomerRole.spec.js
rename to services/loopback/common/methods/client/specs/hasCustomerRole.spec.js
index 637d3be888..32773e25e8 100644
--- a/services/client/common/methods/client/specs/hasCustomerRole.spec.js
+++ b/services/loopback/common/methods/client/specs/hasCustomerRole.spec.js
@@ -1,4 +1,4 @@
-const app = require('../../../../server/server');
+const app = require('../../../../../client/server/server');
 const catchErrors = require('../../../../../../services/utils/jasmineHelpers').catchErrors;
 
 describe('Client hasCustomerRole', () => {
diff --git a/services/client/common/methods/client/specs/listAddresses.spec.js b/services/loopback/common/methods/client/specs/listAddresses.spec.js
similarity index 90%
rename from services/client/common/methods/client/specs/listAddresses.spec.js
rename to services/loopback/common/methods/client/specs/listAddresses.spec.js
index 594b1c9e73..0369d4bb0f 100644
--- a/services/client/common/methods/client/specs/listAddresses.spec.js
+++ b/services/loopback/common/methods/client/specs/listAddresses.spec.js
@@ -1,4 +1,4 @@
-const app = require('../../../../server/server');
+const app = require('../../../../../client/server/server');
 const catchErrors = require('../../../../../../services/utils/jasmineHelpers');
 
 describe('Client addresses', () => {
diff --git a/services/loopback/common/methods/client/specs/listWorkers.spec.js b/services/loopback/common/methods/client/specs/listWorkers.spec.js
new file mode 100644
index 0000000000..823cb6db12
--- /dev/null
+++ b/services/loopback/common/methods/client/specs/listWorkers.spec.js
@@ -0,0 +1,15 @@
+const app = require('../../../../../client/server/server');
+const catchErrors = require('../../../../../../services/utils/jasmineHelpers').catchErrors;
+
+describe('Client listWorkers', () => {
+    it('should call the listWorkers()', done => {
+        app.models.Client.listWorkers()
+            .then(result => {
+                let amountOfEmployees = Object.keys(result).length;
+
+                expect(amountOfEmployees).toEqual(6);
+                done();
+            })
+            .catch(catchErrors(done));
+    });
+});
diff --git a/services_tests.js b/services_tests.js
index 76ddadb327..b64bda5ed3 100644
--- a/services_tests.js
+++ b/services_tests.js
@@ -18,6 +18,7 @@ jasmine.loadConfig({
     spec_dir: 'services',
     spec_files: [
         'auth/server/**/*[sS]pec.js',
+        'loopback/common/**/*[sS]pec.js',
         'client/common/**/*[sS]pec.js'
     ],
     helpers: [