diff --git a/e2e-tests/manager/01-generalParameters.js b/e2e-tests/manager/01-generalParameters.js
index af9e0c2c4049379a07a53a09f7344e703cd27e04..e83cdbaaa280388feecb45b126cca45302a94b78 100644
--- a/e2e-tests/manager/01-generalParameters.js
+++ b/e2e-tests/manager/01-generalParameters.js
@@ -70,6 +70,7 @@ describe('01 Lemonldap::NG Manager', function() {
     });
     it('General Parameters > Authn. parameters > Users modules => Should have 7 modules availabled with "Same" selected', function() {
       element(by.id('t-userDB')).click();
+      browser.sleep(1000);
       expect(element(by.css('option[selected="selected"]')).getAttribute('Value')).toEqual('Same');
       expect(element.all(by.repeater('item in currentNode.select')).count()).toEqual(7);
     });
diff --git a/e2e-tests/manager/05-form.js b/e2e-tests/manager/05-form.js
index 8eb3854e1cfd01703cf902099d07d7717b5ac1d5..cc904bea9b4d52f1105292bd664f0340204f238d 100644
--- a/e2e-tests/manager/05-form.js
+++ b/e2e-tests/manager/05-form.js
@@ -44,7 +44,7 @@ describe('05 Lemonldap::NG Manager', function() {
       ['exportedVars', 'macros', 'groups'].forEach(function(type) {
         element(by.id('a-' + type)).click();
         element(by.id('t-' + type)).click();
-        element(by.css('.glyphicon-plus-sign')).click();
+        element.all(by.css('.glyphicon-plus-sign')).first().click();
         expect(element(by.id('t-' + type + '/n' + id)).getText()).toEqual('new');
         browser.sleep(3000);
         id++;
diff --git a/e2e-tests/manager/06-form.js b/e2e-tests/manager/06-form.js
index 96e7524eb26ff5f3fea442c3ea0c99c1024451cf..b63b96b47310ae59ec771621a3ba1485a4eeaf2d 100644
--- a/e2e-tests/manager/06-form.js
+++ b/e2e-tests/manager/06-form.js
@@ -7,14 +7,19 @@ describe('06 Lemonldap::NG Manager', function() {
   describe('Form control, part 2', function() {
 
     it('should display portal skin choice', function() {
-      browser.get('/#/confs/1');
+      browser.get('/#!/confs/lastest');
       element(by.id('a-generalParameters')).click();
       element(by.id('a-portalParams')).click();
       element(by.id('a-portalCustomization')).click();
       element(by.id('t-portalSkin')).click();
       element(by.css('[ng-click="showModal(\'portalSkinChoice.html\')"]')).click();
+            browser.sleep(1000);
+
       var skinChoice = element.all(by.repeater('b in currentNode.select'));
       expect(skinChoice.count()).toEqual(1);
+      element(by.css('[trspan="cancel"]')).click();
+            browser.sleep(1000);
+
     });
   });
 });
diff --git a/e2e-tests/manager/07-authParams.js b/e2e-tests/manager/07-authParams.js
index 88737742ac93bcafb182715b3c940260f451e9fa..1cb4be6087003c3d716cccbd61984b254852a555 100644
--- a/e2e-tests/manager/07-authParams.js
+++ b/e2e-tests/manager/07-authParams.js
@@ -7,37 +7,57 @@ describe('07 Lemonldap::NG Manager', function() {
   describe('Form control, part 3 - authParams', function() {
 
     it('should display auth modules chosen', function() {
-      browser.get('/#/confs/1');
+      browser.get('/#!/confs/latest');
+            browser.sleep(2000);
+
       element(by.id('a-generalParameters')).click();
+      browser.sleep(1000);
       element(by.id('a-authParams')).click();
+      browser.sleep(1000);
       element(by.id('t-authentication')).click();
+            browser.sleep(2000);
+
       expect(element(by.id('t-demoParams')).isDisplayed()).toBeTruthy();
       element(by.xpath("//option[@value='Apache']")).click();
+      browser.sleep(2000);
       expect(element(by.id('t-apacheParams')).isDisplayed()).toBeTruthy();
     });
 
     it('should display auth modules chosen with authChoice', function() {
       element(by.xpath("//option[@value='Choice']")).click();
+      browser.sleep(1000);
       expect(element(by.id('t-choiceParams')).isDisplayed()).toBeTruthy();
       element(by.id('a-choiceParams')).click();
+      browser.sleep(1000);
       element(by.id('t-authChoiceModules')).click();
-      element(by.css('.glyphicon-plus-sign')).click();
+            browser.sleep(2000);
+
+      //element(by.css('.glyphicon-plus-sign')).click();
+      browser.sleep(2000);
       element(by.id('a-authChoiceModules')).click();
+      browser.sleep(2000);
+      element.all(by.css('.glyphicon-plus-sign')).first().click();
       element(by.id('t-authChoiceModules/n1')).click();
-      element(by.xpath("//option[@value='LDAP']")).click();
+      browser.sleep(2000);
+      element.all(by.xpath("//option[@value='LDAP']")).first().click();
       expect(element(by.id('t-ldapParams')).isDisplayed()).toBeTruthy();
     });
 
     it('should display auth modules chosen with authCombination', function() {
       element(by.id('t-authentication')).click();
+      browser.sleep(1000);
       element(by.xpath("//option[@value='Combination']")).click();
+      browser.sleep(1000);
       expect(element(by.id('t-combinationParams')).isDisplayed()).toBeTruthy();
       element(by.id('a-combinationParams')).click();
+      browser.sleep(1000);
       element(by.id('t-combModules')).click();
+            browser.sleep(2000);
+
       element(by.css('.glyphicon-plus-sign')).click();
       element(by.xpath("//option[@value='DBI']")).click();
       expect(element(by.id('t-dbiParams')).isDisplayed()).toBeTruthy();
-      element(by.xpath("//option[@value='LDAP']")).click();
+      element.all(by.xpath("//option[@value='LDAP']")).first().click();
       expect(element(by.id('t-ldapParams')).isDisplayed()).toBeTruthy();
     });
   });
diff --git a/e2e-tests/manager/07-utf8.js b/e2e-tests/manager/07-utf8.js
index 35b5e361bb3e28603afb1014414ccc0959eddace..25b5209be384d6b843c963f4eb32289ea16df971 100644
--- a/e2e-tests/manager/07-utf8.js
+++ b/e2e-tests/manager/07-utf8.js
@@ -7,7 +7,7 @@ describe('07u Lemonldap::NG Manager', function() {
   describe('Apply mechanism', function() {
 
     it('should be able to send UTF-8 chars', function() {
-      browser.get('/#/confs/latest');
+      browser.get('/#!/confs/latest');
       element(by.id('a-generalParameters')).click();
       element(by.id('a-advancedParams')).click();
       element(by.id('a-security')).click();
@@ -18,6 +18,8 @@ describe('07u Lemonldap::NG Manager', function() {
       element(by.id('save')).click();
       element(by.id('longtextinput')).sendKeys('UTF-8 tests');
       element(by.id('saveok')).click();
+            browser.sleep(2000);
+
       element(by.id('messageok')).click();
       expect(element(by.id('cfgnum')).getText()).toEqual('2');
     });
diff --git a/e2e-tests/manager/08-apply.js b/e2e-tests/manager/08-apply.js
index a0bc1f384097829fcc378732f568ce277ad1ce05..773e4b8113e5b10db7aa5440bd02aa85c43fa606 100644
--- a/e2e-tests/manager/08-apply.js
+++ b/e2e-tests/manager/08-apply.js
@@ -7,25 +7,38 @@ describe('08 Lemonldap::NG Manager', function() {
   describe('Apply mechanism', function() {
 
     it('should be able to add reload urls', function() {
-      browser.get('/#/confs/latest');
+      browser.get('/#!/confs/latest');
+      browser.sleep(1000);
       element(by.id('a-generalParameters')).click();
-      element(by.id('t-reloadParams')).click();
+      element(by.id('a-reloadParams')).click();
       element(by.id('t-reloadUrls')).click();
+            element(by.id('a-reloadUrls')).click();
+
+      browser.sleep(1000);
+      //element(by.id('a-reloadUrls')).click();
       element(by.css('.glyphicon-plus-sign')).click();
-      element(by.id('a-reloadUrls')).click();
+      browser.sleep(1000);
+
       element(by.id('t-reloadUrls/n1')).click();
-      element(by.id('hashkeyinput')).clear().sendKeys('auth.example.com:19876');
-      element(by.id('hashvalueinput')).clear().sendKeys('http://auth.example.com:19876/static/nothing');
+      browser.sleep(1000);
+      element(by.id('hashkeyinput')).clear().sendKeys('auth.example.com');
+      browser.sleep(1000);
+      element(by.id('hashvalueinput')).clear().sendKeys('http://auth.example.com:19876/static/common/icons/ok.png');
+      browser.sleep(1000);
       element(by.css('.glyphicon-plus-sign')).click();
       element(by.id('t-reloadUrls/n2')).click();
-      element(by.id('hashkeyinput')).clear().sendKeys('manager.example.com:19876');
-      element(by.id('hashvalueinput')).clear().sendKeys('http://auth.example.com:19876/static/js/manager.js');
+      element(by.id('hashkeyinput')).clear().sendKeys('manager.example.com');
+      element(by.id('hashvalueinput')).clear().sendKeys('http://manager.example.com:19876/static/js/manager.js');
+            browser.sleep(1000);
+
     });
     it('should save new configuration', function() {
       element(by.id('save')).click();
       element(by.id('longtextinput')).sendKeys('Reload URLs test');
       element(by.id('saveok')).click();
       expect(element.all(by.repeater('item in item.items')).count()).toEqual(2);
+            browser.sleep(1000);
+
       element(by.id('messageok')).click();
       expect(element(by.id('cfgnum')).getText()).toEqual('3');
     });
diff --git a/e2e-tests/manager/11-oidcop-config.js b/e2e-tests/manager/11-oidcop-config.js
index aa2c6d94e3825a94a2c3b783db23e1960a983228..d1128e7c4a886236883934943d399719ac96da22 100644
--- a/e2e-tests/manager/11-oidcop-config.js
+++ b/e2e-tests/manager/11-oidcop-config.js
@@ -9,7 +9,7 @@ describe('11 Lemonldap::NG Manager', function() {
     it('should add an OIDC OP', function() {
       browser.get('/#/confs/latest');
       element(by.id('t-oidcOPMetaDataNodes')).click();
-      element(by.css('.glyphicon-plus-sign')).click();
+      element.all(by.css('.glyphicon-plus-sign')).first().click();
       element(by.id('promptok')).click();
       browser.sleep(500);
       element(by.id('a-oidcOPMetaDataNodes/new__op-example')).click();
@@ -18,7 +18,7 @@ describe('11 Lemonldap::NG Manager', function() {
       element(by.id('t-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataJWKS')).click();
       element(by.id('filetext')).sendKeys('{"c":"d"}');
       element(by.id('t-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataExportedVars')).click();
-      element(by.css('.glyphicon-plus-sign')).click();
+      element.all(by.css('.glyphicon-plus-sign')).first().click();
       //element(by.id('a-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataExportedVars')).click();
       element(by.id('t-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataExportedVars/n1')).click();
       element(by.id('hashkeyinput')).clear().sendKeys('MyKey');
diff --git a/e2e-tests/manager/12-oidcrp-config.js b/e2e-tests/manager/12-oidcrp-config.js
index 7d284e90ecc38d9682214ae68310c0f3b66084df..b23ef1afd2559d56ca507b363195c457ca3b7920 100644
--- a/e2e-tests/manager/12-oidcrp-config.js
+++ b/e2e-tests/manager/12-oidcrp-config.js
@@ -9,12 +9,12 @@ describe('12 Lemonldap::NG Manager', function() {
     it('should add an OIDC RP', function() {
       browser.get('/#/confs/latest');
       element(by.id('t-oidcRPMetaDataNodes')).click();
-      element(by.css('.glyphicon-plus-sign')).click();
+      element.all(by.css('.glyphicon-plus-sign')).first().click();
       element(by.id('promptok')).click();
       browser.sleep(500);
       element(by.id('a-oidcRPMetaDataNodes/new__rp-example')).click();
       element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataExportedVars')).click();
-      element(by.css('.glyphicon-plus-sign')).click();
+      element.all(by.css('.glyphicon-plus-sign')).first().click();
       //element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataExportedVars')).click();
       element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataExportedVars/n1')).click();
       element(by.id('hashkeyinput')).clear().sendKeys('MyKey');
@@ -24,7 +24,7 @@ describe('12 Lemonldap::NG Manager', function() {
       element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsClientID')).click();
       element(by.id('textinput')).clear().sendKeys('MyClientID');
       element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click();
-      element(by.css('.glyphicon-plus-sign')).click();
+      element.all(by.css('.glyphicon-plus-sign')).first().click();
       //element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click();
       element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims/n2')).click();
       element(by.id('hashkeyinput')).clear().sendKeys('MyClaim');
diff --git a/e2e-tests/manager/36-diff.js b/e2e-tests/manager/36-diff.js
index 800dd1f41b067c81b0ea22170f5f29d64cb1e4e9..94aeafbf914d13116ecd3c62e1408d66a84f82d6 100644
--- a/e2e-tests/manager/36-diff.js
+++ b/e2e-tests/manager/36-diff.js
@@ -7,7 +7,9 @@ describe('36 Lemonldap::NG Manager', function() {
   describe('Diff interface', function() {
 
     it('should find key changed', function() {
-      browser.get('/diff.html#!/6/7');
+      browser.get('/diff.html#!/5/6');
+            browser.sleep(5000);
+
       element(by.id('t-generalParameters')).click();
       element(by.id('t-advancedParams')).click();
       element(by.id('t-security')).click();
diff --git a/e2e-tests/manager/40-sessions.js b/e2e-tests/manager/40-sessions.js
index 05aac57e9403f7ebcc6fff0e8251436c0d1352fc..98264abbba8b7c34713251103031c05ceae90e7d 100644
--- a/e2e-tests/manager/40-sessions.js
+++ b/e2e-tests/manager/40-sessions.js
@@ -6,7 +6,7 @@ describe('40 Lemonldap::NG Manager', function() {
     browser.get('/');
     var links = element.all(by.repeater('l in links'));
     expect(links.count()).toEqual(4);
-    element(by.xpath("//a[@href='sessions.html']")).click();
+    element.all(by.xpath("//a[@href='sessions.html']")).first().click();
   });
 
 });
diff --git a/e2e-tests/protractor-conf.js b/e2e-tests/protractor-conf.js
index 328e6a2cb23ad2933b7924d197aaaa3440c0a54a..35fec1a718bb030e76d6bcad8dec72f893f7de66 100644
--- a/e2e-tests/protractor-conf.js
+++ b/e2e-tests/protractor-conf.js
@@ -1,10 +1,10 @@
 exports.config = {
-  allScriptsTimeout: 11000,
+  allScriptsTimeout: 300000,
 
   // Specific test
-  specs: process.env.E2E_TESTS,
+  // specs: process.env.E2E_TESTS,
   // All tests
-  //specs: ['handler/*.js', 'portal/*.js', 'manager/*.js' ],
+  specs: ['portal/*.js', 'handler/*.js', 'manager/*.js' ],
 
     capabilities: {
     'browserName': 'chrome'
@@ -17,6 +17,6 @@ exports.config = {
   framework: 'jasmine',
 
   jasmineNodeOpts: {
-    defaultTimeoutInterval: 30000
+    defaultTimeoutInterval: 60000
   }
 };
\ No newline at end of file