diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d81d18a330c54163027b77741001e6febb0853de..71c42dff38c1d78e7fc46b6f8327051707750094 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,24 @@ sast:
 include:
   - template: Security/SAST.gitlab-ci.yml
 
+unit-test:
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
+  stage: test
+  before_script:
+    - apk add git
+    - apk add bash
+  script:
+    - yarn
+    - yarn test --ci --reporters=default --reporters=jest-junit --coverage
+  coverage: "/All files[^|]*\\|[^|]*\\s+([\\d\\.]+)/"
+  artifacts:
+    reports:
+      junit:
+        - junit.xml
+  only:
+    - merge_requests
+    - main
+
 build-dev:
   image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
   stage: build
@@ -36,22 +54,8 @@ build-dev:
     - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/factory/llle_project/enedis-sge-konnector.git
     - git config --global credential.helper store
     - yarn deploy-dev
-
-unit-test:
-  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
-  stage: test
-  before_script:
-    - apk add git
-    - apk add bash
-  script:
-    - yarn
-    - yarn test --ci --reporters=default --reporters=jest-junit --coverage
-  coverage: "/All files[^|]*\\|[^|]*\\s+([\\d\\.]+)/"
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - junit.xml
+  only:
+    - merge_requests
 
 build:
   image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7d713c07147ad7a18f6734acb371f9144a8af06b..36fb84cf1c765d44fb033da790d9ed1df38772d0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -29,11 +29,13 @@
     "Arret",
     "backoffice",
     "catched",
+    "cicid",
     "Corrigees",
     "cozyclient",
     "criteres",
     "Derniere",
     "Detaillees",
+    "ecolyo",
     "enedis",
     "Enedis",
     "enedissgegrandlyon",