diff --git a/Makefile b/Makefile
index adae43b..ba74a55 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,10 @@ run_parallel_cg:
 run_parallel_cg_template:
 	parallel < ./conf/list_cg_template_test.txt
 
+.PHONY: run_parallel_cg_migrator
+run_parallel_cg_migrator:
+	parallel < ./conf/list_cg_migrator_test.txt
+
 #############
 #  INSTALL  #
 #############
@@ -589,6 +593,9 @@ test_full:
 .PHONY: test_full_fast
 test_full_fast:
 	./script/make.sh clean
+	# Need to create a BD to create cache _cache_erplibre_base
+	./script/database/db_restore.py --database test
+	#./script/test/run_parallel_test.py --keep_cache
 	./script/test/run_parallel_test.py
 	# TODO This test is broken in parallel
 	./script/make.sh test_code_generator_hello_world
@@ -596,6 +603,8 @@ test_full_fast:
 .PHONY: test_full_fast_coverage
 test_full_fast_coverage:
 	./script/make.sh clean
+	# Need to create a BD to create cache _cache_erplibre_base
+	./script/database/db_restore.py --database test
 	./.venv/bin/coverage erase
 	./script/test/run_parallel_test.py --coverage
 	# TODO This test is broken in parallel
diff --git a/conf/list_cg_migrator_test.txt b/conf/list_cg_migrator_test.txt
new file mode 100644
index 0000000..719c6e2
--- /dev/null
+++ b/conf/list_cg_migrator_test.txt
@@ -0,0 +1 @@
+./script/addons/install_addons_restore_dev.sh code_generator_migrator_demo_mariadb_sql_example_1
diff --git a/conf/list_cg_template_test.txt b/conf/list_cg_template_test.txt
index d1e804a..4bf8e7d 100644
--- a/conf/list_cg_template_test.txt
+++ b/conf/list_cg_template_test.txt
@@ -1,6 +1,8 @@
-./script/addons/install_addons_restore_dev.sh code_generator_template_demo_internal
-./script/addons/install_addons_restore_dev.sh code_generator_template_demo_internal_inherit
-./script/addons/install_addons_restore_dev.sh code_generator_template_demo_mariadb_sql_example_1
-./script/addons/install_addons_restore_dev.sh code_generator_template_demo_portal
-./script/addons/install_addons_restore_dev.sh code_generator_template_demo_sysadmin_cron
-./script/addons/install_addons_restore_dev.sh code_generator_template_demo_website_snippet
\ No newline at end of file
+./script/addons/install_addons_cg_template_restore_dev.sh code_generator code_generator_template_code_generator
+./script/addons/install_addons_cg_template_restore_dev.sh demo_internal code_generator_template_demo_internal
+./script/addons/install_addons_cg_template_restore_dev.sh demo_internal_inherit code_generator_template_demo_internal_inherit
+./script/addons/install_addons_cg_template_restore_dev.sh demo_mariadb_sql_example_1 code_generator_template_demo_mariadb_sql_example_1
+./script/addons/install_addons_cg_template_restore_dev.sh demo_portal code_generator_template_demo_portal
+./script/addons/install_addons_cg_template_restore_dev.sh auto_backup code_generator_template_demo_sysadmin_cron
+./script/addons/install_addons_cg_template_restore_dev.sh demo_website_multiple_snippet code_generator_template_demo_website_multiple_snippet
+./script/addons/install_addons_cg_template_restore_dev.sh demo_website_snippet code_generator_template_demo_website_snippet
diff --git a/conf/list_cg_test.txt b/conf/list_cg_test.txt
index 66a7c24..971e049 100644
--- a/conf/list_cg_test.txt
+++ b/conf/list_cg_test.txt
@@ -1,4 +1,4 @@
-./script/addons/install_addons_restore_dev.sh code_generator_template_code_generator
+./script/addons/install_addons_restore_dev.sh code_generator_code_generator
 ./script/addons/install_addons_restore_dev.sh code_generator_auto_backup
 ./script/addons/install_addons_restore_dev.sh code_generator_demo
 ./script/addons/install_addons_restore_dev.sh code_generator_demo_export_helpdesk
@@ -12,4 +12,3 @@
 ./script/addons/install_addons_restore_dev.sh code_generator_demo_website_leaflet
 ./script/addons/install_addons_restore_dev.sh code_generator_demo_website_multiple_snippet
 ./script/addons/install_addons_restore_dev.sh code_generator_demo_website_snippet
-./script/addons/install_addons_restore_dev.sh code_generator_migrator_demo_mariadb_sql_example_1
\ No newline at end of file
diff --git a/manifest/default.dev.xml b/manifest/default.dev.xml
index 18643a0..765680d 100644
--- a/manifest/default.dev.xml
+++ b/manifest/default.dev.xml
@@ -100,8 +100,8 @@
   <project name="odoo-base-addons.git" path="addons/Numigi_odoo-base-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
   <project name="odoo-business-spending-management-quebec-canada.git" path="addons/MathBenTech_odoo-business-spending-management-quebec-canada" remote="MathBenTech" groups="addons,base"/>
   <project name="odoo-cloud-platform.git" path="addons/camptocamp_odoo-cloud-platform" remote="camptocamp" revision="12.0_dev" groups="addons"/>
-  <project name="odoo-code-generator-template.git" path="addons/TechnoLibre_odoo-code-generator-template" revision="dev" remote="TechnoLibre" groups="addons,code_generator,image_db"/>
-  <project name="odoo-code-generator.git" path="addons/TechnoLibre_odoo-code-generator" remote="TechnoLibre" revision="dev" groups="addons,code_generator,image_db"/>
+  <project name="odoo-code-generator-template.git" path="addons/TechnoLibre_odoo-code-generator-template" revision="12.0" remote="TechnoLibre" groups="addons,code_generator,image_db"/>
+  <project name="odoo-code-generator.git" path="addons/TechnoLibre_odoo-code-generator" remote="TechnoLibre" revision="12.0" groups="addons,code_generator,image_db"/>
   <project name="odoo-development.git" path="doc/itpp-labs_odoo-development" remote="itpp-labs" revision="12.0_dev" groups="odoo"/>
   <project name="odoo-entertainment-addons.git" path="addons/Numigi_odoo-entertainment-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
   <project name="odoo-git-addons.git" path="addons/Numigi_odoo-git-addons" remote="Numigi" groups="addons"/>
diff --git a/script/addons/check_addons_exist.py b/script/addons/check_addons_exist.py
index f3d7d48..f5473f3 100755
--- a/script/addons/check_addons_exist.py
+++ b/script/addons/check_addons_exist.py
@@ -67,8 +67,8 @@ def main():
         _logger.error(f"Missing section 'options' in '{config.config}'")
         return -1
 
-    lst_addons_path = addons_path.split(",")
-    lst_module = config.module.split(",")
+    lst_addons_path = addons_path.strip(",").split(",")
+    lst_module = config.module.strip(",").split(",")
 
     dct_module_exist = defaultdict(list)
     dct_module_exist_empty = defaultdict(list)
diff --git a/script/addons/coverage_install_addons_restore_dev.sh b/script/addons/coverage_install_addons_restore_dev.sh
index b33fa4b..93cfb31 100755
--- a/script/addons/coverage_install_addons_restore_dev.sh
+++ b/script/addons/coverage_install_addons_restore_dev.sh
@@ -1,4 +1,15 @@
 #!/usr/bin/env bash
 # "$1" code_generator_name
 ./script/database/db_restore.py --database "$1"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/database/db_restore.py into coverage_install_addons_restore_dev.sh"
+  exit 1
+fi
+
 ./script/addons/coverage_install_addons_dev.sh "$1" "$1"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/addons/coverage_install_addons_dev.sh into coverage_install_addons_restore_dev.sh"
+  exit 1
+fi
diff --git a/script/addons/install_addons_cg_template_restore_dev.sh b/script/addons/install_addons_cg_template_restore_dev.sh
new file mode 100755
index 0000000..fc614ec
--- /dev/null
+++ b/script/addons/install_addons_cg_template_restore_dev.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# "$1" module_name
+# "$1" code_generator_template_name
+./script/database/db_restore.py --database "$2"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/database/db_restore.py into install_addons_cg_template_restore_dev.sh"
+  exit 1
+fi
+./script/addons/install_addons_dev.sh "$2" "$1"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/addons/install_addons_dev.sh install module into install_addons_cg_template_restore_dev.sh"
+  exit 1
+fi
+./script/addons/install_addons_dev.sh "$2" "$2"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/addons/install_addons_dev.sh install template into install_addons_cg_template_restore_dev.sh"
+  exit 1
+fi
diff --git a/script/addons/install_addons_from_file.sh b/script/addons/install_addons_from_file.sh
index 108c176..6c347e4 100755
--- a/script/addons/install_addons_from_file.sh
+++ b/script/addons/install_addons_from_file.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 # $1 BD NAME
 # $2 file_path
-./script/addons/install_addons.sh "$1" "$(<$2)"
\ No newline at end of file
+./script/addons/install_addons.sh "$1" "$(<$2)"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/addons/install_addons.sh  into install_addons_from_file.sh"
+  exit 1
+fi
diff --git a/script/addons/install_addons_restore_dev.sh b/script/addons/install_addons_restore_dev.sh
index f5e2115..1d51b44 100755
--- a/script/addons/install_addons_restore_dev.sh
+++ b/script/addons/install_addons_restore_dev.sh
@@ -1,4 +1,15 @@
 #!/usr/bin/env bash
 # "$1" code_generator_name
 ./script/database/db_restore.py --database "$1"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/database/db_restore.py into install_addons_restore_dev.sh"
+  exit 1
+fi
+
 ./script/addons/install_addons_dev.sh "$1" "$1"
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  echo "Error ./script/addons/install_addons_dev.sh into install_addons_restore_dev.sh"
+  exit 1
+fi
diff --git a/script/install/install_locally_dev.sh b/script/install/install_locally_dev.sh
index 2f4cc91..bfe9f12 100755
--- a/script/install/install_locally_dev.sh
+++ b/script/install/install_locally_dev.sh
@@ -11,13 +11,14 @@ fi
 
 # Update git-repo
 ./script/manifest/update_manifest_local_dev.sh
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
     echo "Error manifest update, check git-repo."
     exit 1
 fi
 
 # Install maintainer-tools
-cd script/OCA_maintainer-tools
+cd script/OCA_maintainer-tools || exit
 # virtualenv is not installed by default
 #virtualenv env
 ../../.venv/bin/python -m venv env
diff --git a/script/install/install_locally_prod.sh b/script/install/install_locally_prod.sh
index d220a77..2d23e59 100755
--- a/script/install/install_locally_prod.sh
+++ b/script/install/install_locally_prod.sh
@@ -11,6 +11,7 @@ fi
 
 # Update git-repo
 ./script/manifest/update_manifest_prod.sh
+retVal=$?
 if [[ $retVal -ne 0 ]]; then
     echo "Error manifest update, check git-repo."
     exit 1