diff --git a/tests/scenarios/ContentWatch/ContentWatchArticleAgendaTest.php b/tests/scenarios/ContentWatch/ContentWatchArticleAgendaTest.php
index fdf69b04a87a04d02420c974c7e5a66c46d72fec..5e805b5bda5d0a717615c46a5b360533afe95705 100644
--- a/tests/scenarios/ContentWatch/ContentWatchArticleAgendaTest.php
+++ b/tests/scenarios/ContentWatch/ContentWatchArticleAgendaTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'tests/scenarios/Templates/TemplatesTest.php';
+require_once 'tests/scenarios/Templates/TemplateGeneralTest.php';
 
-abstract class ContentWatchArticleAgendaTestCase extends TemplatesIntonationTestCase {
+abstract class ContentWatchArticleAgendaTestCase extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
diff --git a/tests/scenarios/ContentWatch/ContentWatchSelectionTest.php b/tests/scenarios/ContentWatch/ContentWatchSelectionTest.php
index d998cfc244fe537f6aaec294f8a257ec9e6e2e01..4ac6cb6d8023c68359cc1e357af484c1760fc791 100644
--- a/tests/scenarios/ContentWatch/ContentWatchSelectionTest.php
+++ b/tests/scenarios/ContentWatch/ContentWatchSelectionTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'tests/scenarios/Templates/TemplatesTest.php';
+require_once 'tests/scenarios/Templates/TemplateGeneralTest.php';
 
-abstract class ContentWatchSelectionTestCase extends TemplatesIntonationTestCase {
+abstract class ContentWatchSelectionTestCase extends TemplateGeneralIntonationTestCase {
 
   protected Class_PanierNotice $_selection;
 
diff --git a/tests/scenarios/ContentWatch/ContentWatchWidgetAdminTest.php b/tests/scenarios/ContentWatch/ContentWatchWidgetAdminTest.php
index 408c20d94dd16bb6ac0c5ded7755968a4ce41ac4..c85bab5d5577988fe9bca796f106b074c9dd3224 100644
--- a/tests/scenarios/ContentWatch/ContentWatchWidgetAdminTest.php
+++ b/tests/scenarios/ContentWatch/ContentWatchWidgetAdminTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'tests/scenarios/Templates/TemplatesTest.php';
+require_once 'tests/scenarios/Templates/TemplateGeneralTest.php';
 
-abstract class ContentWatchWidgetAdminTestCase extends TemplatesIntonationTestCase {
+abstract class ContentWatchWidgetAdminTestCase extends TemplateGeneralIntonationTestCase {
 
   public function watchingWidgetId() : array {
     return [[17],
@@ -162,7 +162,7 @@ class ContentWatchWidgetAdminDisplayWatchLinkTest
 
 
 class ContentWatchWidgetAdminWidgetWatchActionTest
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void
   {
@@ -237,7 +237,7 @@ class ContentWatchWidgetAdminWidgetWatchActionTest
 
 
 class ContentWatchWidgetAdminWidgetUnwatchActionTest
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void
   {
diff --git a/tests/scenarios/SearchResult/SearchResultFacetsTest.php b/tests/scenarios/SearchResult/SearchResultFacetsTest.php
index d7a28b4fba42a29009290a436aeca4c188036a79..0a4eb26e0dc5d85e095a843185283ff80183db96 100644
--- a/tests/scenarios/SearchResult/SearchResultFacetsTest.php
+++ b/tests/scenarios/SearchResult/SearchResultFacetsTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'tests/scenarios/Templates/TemplatesTest.php';
+require_once 'tests/scenarios/Templates/TemplateGeneralTest.php';
 
-abstract class SearchResultFacetsHeaderTestCase extends TemplatesIntonationTestCase {
+abstract class SearchResultFacetsHeaderTestCase extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
diff --git a/tests/scenarios/Templates/Search/DeduplCodifPostTest.php b/tests/scenarios/Templates/Search/DeduplCodifPostTest.php
index f3070d1ee04b81c7413b6c7d2002ac1735e4ce4f..1c02f1ab0790ea0ffd66fc56dc24792dcb6fc56e 100644
--- a/tests/scenarios/Templates/Search/DeduplCodifPostTest.php
+++ b/tests/scenarios/Templates/Search/DeduplCodifPostTest.php
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'tests/scenarios/Templates/TemplatesTest.php';
+require_once 'tests/scenarios/Templates/TemplateGeneralTest.php';
 
-class Templates_Search_DeduplCodifPostTest extends TemplatesIntonationTestCase
+class Templates_Search_DeduplCodifPostTest extends TemplateGeneralIntonationTestCase
 {
 
-  public function setUp(): void  
+  public function setUp(): void
   {
     parent::setUp();
 
diff --git a/tests/scenarios/Templates/Search/DeduplCodifTest.php b/tests/scenarios/Templates/Search/DeduplCodifTest.php
index acada775bb9160f65f5ff2fdb2a604fb8e000a77..5bf609efc7fe00d20f173fe8063da964e3e4d08a 100644
--- a/tests/scenarios/Templates/Search/DeduplCodifTest.php
+++ b/tests/scenarios/Templates/Search/DeduplCodifTest.php
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'tests/scenarios/Templates/TemplatesTest.php';
+require_once 'tests/scenarios/Templates/TemplateGeneralTest.php';
 
-class Templates_Search_DeduplCodifTest extends TemplatesIntonationTestCase
+class Templates_Search_DeduplCodifTest extends TemplateGeneralIntonationTestCase
 {
 
-  public function setUp(): void  
+  public function setUp(): void
   {
     parent::setUp();
 
diff --git a/tests/scenarios/Templates/TemplatesTest.php b/tests/scenarios/Templates/TemplateGeneralTest.php
similarity index 92%
rename from tests/scenarios/Templates/TemplatesTest.php
rename to tests/scenarios/Templates/TemplateGeneralTest.php
index bcf2dcbd86fc523de468aa5c4fb30386a880e1ac..7120142df20d78687a28631d4da47d907a838758 100644
--- a/tests/scenarios/Templates/TemplatesTest.php
+++ b/tests/scenarios/Templates/TemplateGeneralTest.php
@@ -20,7 +20,7 @@
  */
 
 
-abstract class TemplatesEnabledTestCase extends Admin_AbstractControllerTestCase {
+abstract class TemplateGeneralEnabledTestCase extends Admin_AbstractControllerTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -31,7 +31,7 @@ abstract class TemplatesEnabledTestCase extends Admin_AbstractControllerTestCase
 
 
 
-class TemplatesControllerApplyIntonationTest extends TemplatesEnabledTestCase {
+class TemplateGeneralControllerApplyIntonationTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -66,7 +66,7 @@ class TemplatesControllerApplyIntonationTest extends TemplatesEnabledTestCase {
 
 
   /** @test */
-  public function profile3ShouldUseTemplateIntonation() {
+  public function profile3ShouldUseTemplateGeneralIntonation() {
     $this->dispatch('/admin/template/apply/template/INTONATION/on/3');
     $this->assertEquals('INTONATION', Class_Profil::find(3)->getTemplate());
   }
@@ -75,7 +75,7 @@ class TemplatesControllerApplyIntonationTest extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesControllerTryIntonationTest extends TemplatesEnabledTestCase {
+class TemplateGeneralControllerTryIntonationTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -94,13 +94,13 @@ class TemplatesControllerTryIntonationTest extends TemplatesEnabledTestCase {
 
 
   /** @test */
-  public function porfil3shouldContainsTemplateKeyInComments() {
+  public function porfil3shouldContainsTemplateGeneralKeyInComments() {
     $this->assertEquals('eb0da18cfce1c2efaaa1d1ec97c86b10', Class_Profil::find(3)->getCommentaire());
   }
 
 
   /** @test */
-  public function porfil3shouldContainsTemplateIntonation() {
+  public function porfil3shouldContainsTemplateGeneralIntonation() {
     $this->assertEquals('INTONATION', Class_Profil::find(3)->getTemplate());
   }
 }
@@ -108,7 +108,7 @@ class TemplatesControllerTryIntonationTest extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesControllerResetIntonationTest extends TemplatesEnabledTestCase {
+class TemplateGeneralControllerResetIntonationTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -158,7 +158,7 @@ class TemplatesControllerResetIntonationTest extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesControllerTryHistoricTest extends TemplatesEnabledTestCase {
+class TemplateGeneralControllerTryHistoricTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -177,7 +177,7 @@ class TemplatesControllerTryHistoricTest extends TemplatesEnabledTestCase {
 
 
   /** @test */
-  public function porfil3shouldContainsTemplateHistoric() {
+  public function porfil3shouldContainsTemplateGeneralHistoric() {
     $this->assertEquals('HISTORIC', Class_Profil::find(3)->getTemplate());
   }
 }
@@ -185,7 +185,7 @@ class TemplatesControllerTryHistoricTest extends TemplatesEnabledTestCase {
 
 
 
-abstract class TemplatesIntonationTestCase extends TemplatesEnabledTestCase {
+abstract class TemplateGeneralIntonationTestCase extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -345,7 +345,7 @@ abstract class TemplatesIntonationTestCase extends TemplatesEnabledTestCase {
                     ->setLibelle('Test');
     $profile->assertSave();
 
-    $settings = $this->fixture('Class_Template_Settings',
+    $settings = $this->fixture(Class_Template_Settings::class,
                                ['id' => 456,
                                 'template' => 'INTONATION']);
 
@@ -383,7 +383,7 @@ abstract class TemplatesIntonationTestCase extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesDispatchIntonationTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -428,13 +428,13 @@ class TemplatesDispatchIntonationTest extends TemplatesIntonationTestCase {
 
 
   /** @test */
-  public function currentProfilTemplateShouldBeIntonation() {
+  public function currentProfilTemplateGeneralShouldBeIntonation() {
     $this->assertEquals('INTONATION', Class_Profil::getCurrentProfil()->getTemplate());
   }
 
 
   /** @test */
-  public function currentTemplateShouldBeIntonation() {
+  public function currentTemplateGeneralShouldBeIntonation() {
     $this->assertEquals('INTONATION', Class_Template::current()->getId());
   }
 
@@ -581,7 +581,7 @@ class TemplatesDispatchIntonationTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchEditSectionTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchEditSectionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -616,7 +616,7 @@ class TemplatesDispatchEditSectionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesPostDispatchEditSectionTest extends TemplatesIntonationTestCase {
+class TemplateGeneralPostDispatchEditSectionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -637,7 +637,7 @@ class TemplatesPostDispatchEditSectionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchEditPageTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchEditPageTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -655,7 +655,7 @@ class TemplatesDispatchEditPageTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchEditAllSectionTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchEditAllSectionTest extends TemplateGeneralIntonationTestCase {
 
   public function xpaths() {
     return [
@@ -748,8 +748,8 @@ class TemplatesDispatchEditAllSectionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchIntonationWithSectionSettingsTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationWithSectionSettingsTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -779,7 +779,7 @@ class TemplatesDispatchIntonationWithSectionSettingsTest
 
 
 
-class TemplatesEditTest extends TemplatesEnabledTestCase {
+class TemplateGeneralEditTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -834,7 +834,7 @@ class TemplatesEditTest extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesPostEditTest extends TemplatesEnabledTestCase {
+class TemplateGeneralPostEditTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -848,7 +848,7 @@ class TemplatesPostEditTest extends TemplatesEnabledTestCase {
 
 
   /** @test */
-  public function templateSettingsTemplateShouldBeIntonation() {
+  public function templateSettingsTemplateGeneralShouldBeIntonation() {
     $this->assertEquals('INTONATION', Class_Template::current()->getTemplate());
   }
 
@@ -883,7 +883,7 @@ class TemplatesPostEditTest extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesEditHistoricTest extends TemplatesEnabledTestCase {
+class TemplateGeneralEditHistoricTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -893,7 +893,7 @@ class TemplatesEditHistoricTest extends TemplatesEnabledTestCase {
 
 
   /** @test */
-  public function templateSettingsTemplateShouldBeHistoric() {
+  public function templateSettingsTemplateGeneralShouldBeHistoric() {
     $this->assertXPathContentContains('//div', 'Paramétrer le thème Historique');
   }
 }
@@ -901,8 +901,8 @@ class TemplatesEditHistoricTest extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesNotLoggedTestDispatchIntonationTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralNotLoggedTestDispatchIntonationTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -946,7 +946,7 @@ class TemplatesNotLoggedTestDispatchIntonationTest
 
 
 
-class TemplatesIntonationHydratingtest extends ModelTestCase {
+class TemplateGeneralIntonationHydratingtest extends ModelTestCase {
 
   protected $_template;
 
@@ -1009,7 +1009,7 @@ class TemplatesIntonationHydratingtest extends ModelTestCase {
 
 
 
-class TemplatesLoginWidgetSettingsFormTest extends TemplatesIntonationTestCase {
+class TemplateGeneralLoginWidgetSettingsFormTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1027,7 +1027,7 @@ class TemplatesLoginWidgetSettingsFormTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesWidgetSettingsPostTest extends TemplatesIntonationTestCase {
+class TemplateGeneralWidgetSettingsPostTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1065,7 +1065,7 @@ class TemplatesWidgetSettingsPostTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchIntonationUnloggedTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationUnloggedTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1093,8 +1093,8 @@ class TemplatesDispatchIntonationUnloggedTest extends TemplatesIntonationTestCas
 
 
 
-class TemplatesDispatchIntonationUnloggedWithToggleLoginTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationUnloggedWithToggleLoginTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1132,8 +1132,8 @@ class TemplatesDispatchIntonationUnloggedWithToggleLoginTest
 
 
 
-class TemplatesDispatchIntonationWithHiddenSectionTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationWithHiddenSectionTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1165,7 +1165,7 @@ class TemplatesDispatchIntonationWithHiddenSectionTest
 
 
 
-class TemplatesControllerIndexDispatchWithAdminVarTemplateDisabledTest
+class TemplateGeneralControllerIndexDispatchWithAdminVarTemplateGeneralDisabledTest
   extends Admin_AbstractControllerTestCase {
 
   /** @test */
@@ -1185,7 +1185,7 @@ class TemplatesControllerIndexDispatchWithAdminVarTemplateDisabledTest
 
 
 
-class TemplatesILSBorrowerLoggedTest extends TemplatesIntonationTestCase {
+class TemplateGeneralILSBorrowerLoggedTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1229,7 +1229,7 @@ class TemplatesILSBorrowerLoggedTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesRecordResumeDispatchTest extends TemplatesIntonationTestCase {
+class TemplateGeneralRecordResumeDispatchTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1286,7 +1286,7 @@ class TemplatesRecordResumeDispatchTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchRecordDescriptionTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchRecordDescriptionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1325,7 +1325,7 @@ class TemplatesDispatchRecordDescriptionTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesDispatchRecordRelatedTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchRecordRelatedTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function shouldRenderDescription() {
@@ -1343,7 +1343,7 @@ class TemplatesDispatchRecordRelatedTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchRecordAuthorTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchRecordAuthorTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1428,8 +1428,8 @@ class TemplatesDispatchRecordAuthorTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchIntonationChangeIconAccountTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationChangeIconAccountTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1461,8 +1461,8 @@ class TemplatesDispatchIntonationChangeIconAccountTest
 
 
 
-class TemplatesDispatchIntonationChangeIconAccountWithWrongFilePathTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationChangeIconAccountWithWrongFilePathTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1498,7 +1498,7 @@ class TemplatesDispatchIntonationChangeIconAccountWithWrongFilePathTest
 
 
 
-class TemplatesBibControllerProActionsTest extends TemplatesIntonationTestCase {
+class TemplateGeneralBibControllerProActionsTest extends TemplateGeneralIntonationTestCase {
 
   protected $_creation_image;
 
@@ -1588,7 +1588,7 @@ class TemplatesBibControllerProActionsTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchProfilAccueilTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchProfilAccueilTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1630,7 +1630,7 @@ class TemplatesDispatchProfilAccueilTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchProfilIndexTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchProfilIndexTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function linkToPromoteShouldBePresent() {
@@ -1644,7 +1644,7 @@ class TemplatesDispatchProfilIndexTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesIntonationPromoteProfileTest extends TemplatesIntonationTestCase {
+class TemplateGeneralIntonationPromoteProfileTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1663,7 +1663,7 @@ class TemplatesIntonationPromoteProfileTest extends TemplatesIntonationTestCase
 
 
   /** @test */
-  public function mainProfileShouldUseIntonationTemplate() {
+  public function mainProfileShouldUseIntonationTemplateGeneral() {
     $this->assertEquals('INTONATION', Class_Profil::getPortail()->getTemplate());
   }
 
@@ -1695,7 +1695,7 @@ class TemplatesIntonationPromoteProfileTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesIntonationPromotedProfileTest extends TemplatesIntonationTestCase {
+class TemplateGeneralIntonationPromotedProfileTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1719,7 +1719,7 @@ class TemplatesIntonationPromotedProfileTest extends TemplatesIntonationTestCase
 
 
   /** @test */
-  public function mainProfileShouldUseIntonationTemplate() {
+  public function mainProfileShouldUseIntonationTemplateGeneral() {
     $this->assertEquals('INTONATION', Class_Profil::getPortail()->getTemplate());
   }
 
@@ -1739,7 +1739,7 @@ class TemplatesIntonationPromotedProfileTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesDispatchEditAllActionsTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchEditAllActionsTest extends TemplateGeneralIntonationTestCase {
 
   public function xpaths() {
     return [
@@ -1781,7 +1781,7 @@ class TemplatesDispatchEditAllActionsTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesSearchInSessionTest extends TemplatesIntonationTestCase {
+class TemplateGeneralSearchInSessionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1894,7 +1894,7 @@ class TemplatesSearchInSessionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplateSearchSaveSettingsTest extends TemplatesIntonationTestCase {
+class TemplateGeneralSearchSaveSettingsDispatchTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1933,7 +1933,7 @@ class TemplateSearchSaveSettingsTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplateSearchSavedSettingsTest extends TemplatesIntonationTestCase {
+class TemplateGeneralSearchSavedSettingsTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1994,7 +1994,7 @@ class TemplateSearchSavedSettingsTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplateIntonationWithSkinTest extends TemplatesEnabledTestCase {
+class TemplateGeneralIntonationWithSkinTest extends TemplateGeneralEnabledTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -2090,7 +2090,7 @@ class TemplateIntonationWithSkinTest extends TemplatesEnabledTestCase {
 
 
 
-class TemplatesDispatchIntonationAuthLoginTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationAuthLoginTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -2108,8 +2108,8 @@ class TemplatesDispatchIntonationAuthLoginTest extends TemplatesIntonationTestCa
 
 
 
-class TemplatesDispatchIntonationAuthLoginWithRedirectTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchIntonationAuthLoginWithRedirectTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -2134,7 +2134,7 @@ class TemplatesDispatchIntonationAuthLoginWithRedirectTest
 
 
 
-class TemplatesDispatchSearchWithFacetsTest extends TemplatesIntonationTestCase {
+class TemplateGeneralDispatchSearchWithFacetsTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -2182,7 +2182,7 @@ class TemplatesDispatchSearchWithFacetsTest extends TemplatesIntonationTestCase
 
 
 
-abstract class TemplatesDispatchSearchWithFacetsOpenTestCase extends TemplatesIntonationTestCase {
+abstract class TemplateGeneralDispatchSearchWithFacetsOpenTestCase extends TemplateGeneralIntonationTestCase {
   protected string $_facets_closed_codes = 'TCODE;HPAYS;';
   protected string $_facettes_codes = 'M;S;G';
 
@@ -2217,7 +2217,7 @@ abstract class TemplatesDispatchSearchWithFacetsOpenTestCase extends TemplatesIn
 
 
 
-class TemplatesDispatchSearchWithFacetsClosedTest extends TemplatesDispatchSearchWithFacetsOpenTestCase {
+class TemplateGeneralDispatchSearchWithFacetsClosedTest extends TemplateGeneralDispatchSearchWithFacetsOpenTestCase {
   protected string $_facets_closed_codes = 'S;TCODE;HPAYS;';
 
 
@@ -2232,7 +2232,7 @@ class TemplatesDispatchSearchWithFacetsClosedTest extends TemplatesDispatchSearc
 
 
 
-class TemplatesDispatchSearchWithFacetsOpenTest extends TemplatesDispatchSearchWithFacetsOpenTestCase {
+class TemplateGeneralDispatchSearchWithFacetsOpenTest extends TemplateGeneralDispatchSearchWithFacetsOpenTestCase {
 
 
   /** @test
@@ -2254,8 +2254,8 @@ class TemplatesDispatchSearchWithFacetsOpenTest extends TemplatesDispatchSearchW
 
 
 
-class TemplatesDispatchSearchWithFacetsOpenWithoutPunctuationTest
-  extends TemplatesDispatchSearchWithFacetsOpenTestCase {
+class TemplateGeneralDispatchSearchWithFacetsOpenWithoutPunctuationTest
+  extends TemplateGeneralDispatchSearchWithFacetsOpenTestCase {
   protected string $_facets_closed_codes = 'BTSI';
   protected string $_facettes_codes = 'A';
 
@@ -2279,8 +2279,8 @@ class TemplatesDispatchSearchWithFacetsOpenWithoutPunctuationTest
 
 
 
-class TemplatesDispatchSearchWithFacetsOpenWithoutPunctuationClosedTest
-  extends TemplatesDispatchSearchWithFacetsOpenTestCase {
+class TemplateGeneralDispatchSearchWithFacetsOpenWithoutPunctuationClosedTest
+  extends TemplateGeneralDispatchSearchWithFacetsOpenTestCase {
   protected string $_facets_closed_codes = 'TASI';
   protected string $_facettes_codes = 'A';
 
@@ -2304,7 +2304,7 @@ class TemplatesDispatchSearchWithFacetsOpenWithoutPunctuationClosedTest
 
 
 
-class TemplatesSuggestionAchatAddTest extends TemplatesIntonationTestCase {
+class TemplateGeneralSuggestionAchatAddTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -2336,8 +2336,8 @@ class TemplatesSuggestionAchatAddTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesSuggestionAchatAddPostWithSearchRecordTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralSuggestionAchatAddPostWithSearchRecordTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -2398,8 +2398,8 @@ class TemplatesSuggestionAchatAddPostWithSearchRecordTest
 
 
 
-class TemplatesFormulaireContactActionWithBibSelectorSettingDefaultTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralFormulaireContactActionWithBibSelectorSettingDefaultTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -2417,8 +2417,8 @@ class TemplatesFormulaireContactActionWithBibSelectorSettingDefaultTest
 
 
 
-class TemplatesFormulaireContactActionWithBibSelectorSettingCheckedTest
-  extends TemplatesIntonationTestCase {
+class TemplateGeneralFormulaireContactActionWithBibSelectorSettingCheckedTest
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
diff --git a/tests/scenarios/Templates/TemplatesAbonneSelectionsTest.php b/tests/scenarios/Templates/TemplatesAbonneSelectionsTest.php
index 4fd33339efc0919bb0a01928f2b5dd2c751336b0..5029dce2b772f5c8a02f181897d36ffb22586fa7 100644
--- a/tests/scenarios/Templates/TemplatesAbonneSelectionsTest.php
+++ b/tests/scenarios/Templates/TemplatesAbonneSelectionsTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
-abstract class TemplatesAbonneSelectionsTestCase extends TemplatesIntonationTestCase {
+abstract class TemplatesAbonneSelectionsTestCase extends TemplateGeneralIntonationTestCase {
 
   protected $_emprunteur;
 
diff --git a/tests/scenarios/Templates/TemplatesAbonneTest.php b/tests/scenarios/Templates/TemplatesAbonneTest.php
index 118139c8c26b8edc38b15dc4e70801eb9686729a..422d578b696520dd14e1450999ad5b03224ef440 100644
--- a/tests/scenarios/Templates/TemplatesAbonneTest.php
+++ b/tests/scenarios/Templates/TemplatesAbonneTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 include_once 'tests/fixtures/NanookFixtures.php';
 
-abstract class TemplatesIntonationAccountTestCase extends TemplatesIntonationTestCase {
+abstract class TemplatesIntonationAccountTestCase extends TemplateGeneralIntonationTestCase {
 
   protected $_mock_emprunts, $_emprunteur;
 
diff --git a/tests/scenarios/Templates/TemplatesAccessibilityTest.php b/tests/scenarios/Templates/TemplatesAccessibilityTest.php
index bf4886343599d42a45b11bf122544763bdadabf0..ba9faa34e1e0565ab5e45407eebc2c0afc56da63 100644
--- a/tests/scenarios/Templates/TemplatesAccessibilityTest.php
+++ b/tests/scenarios/Templates/TemplatesAccessibilityTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
-class TemplatesDispatchEditAccessibilityWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchEditAccessibilityWidgetTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     Class_Profil::setCurrentProfil(Class_Profil::find(2));
@@ -44,7 +44,7 @@ class TemplatesDispatchEditAccessibilityWidgetTest extends TemplatesIntonationTe
 
 
 
-class TemplatesDispatchIntonationWithAccessibilityTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationWithAccessibilityTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function eagleEyeShouldBePresent() {
diff --git a/tests/scenarios/Templates/TemplatesAddWidgetTest.php b/tests/scenarios/Templates/TemplatesAddWidgetTest.php
index 68877b6f08d07b6949a3152483b9a19338216ec3..2ea4f2c37854ed243d144c54a5c9892730a80461 100644
--- a/tests/scenarios/Templates/TemplatesAddWidgetTest.php
+++ b/tests/scenarios/Templates/TemplatesAddWidgetTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 
-class TemplatesAddWidgetSimpleTest extends TemplatesIntonationTestCase {
+class TemplatesAddWidgetSimpleTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -139,7 +139,7 @@ class TemplatesAddWidgetSimpleTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplateAddWidgetAddAfterDispatchTest extends TemplatesIntonationTestCase {
+class TemplateAddWidgetAddAfterDispatchTest extends TemplateGeneralIntonationTestCase {
   /** @test */
   public function addWidgetWithConfShouldRedirect() {
     $this->dispatch('/admin/widget/add/after/20/division/2/id_profil/72/template/1/template_no/1');
@@ -171,7 +171,7 @@ class TemplateAddWidgetAddAfterDispatchTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesAddWidgetIdentityProviderEnabledTest extends TemplatesIntonationTestCase {
+class TemplatesAddWidgetIdentityProviderEnabledTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     Class_AdminVar::set('ENABLE_IDENTITY_PROVIDERS', 1);
@@ -188,7 +188,7 @@ class TemplatesAddWidgetIdentityProviderEnabledTest extends TemplatesIntonationT
 
 
 
-class TemplatesAddWidgetIdentityProviderDisabledTest extends TemplatesIntonationTestCase {
+class TemplatesAddWidgetIdentityProviderDisabledTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     Class_AdminVar::set('ENABLE_IDENTITY_PROVIDERS', 0);
@@ -204,7 +204,7 @@ class TemplatesAddWidgetIdentityProviderDisabledTest extends TemplatesIntonation
 
 
 
-class TemplateAddWidgetAddFromTemplateWithAfterParamTest extends TemplatesIntonationTestCase {
+class TemplateAddWidgetAddFromTemplateWithAfterParamTest extends TemplateGeneralIntonationTestCase {
 
   protected $_storm_default_to_volatile = true;
 
@@ -230,7 +230,7 @@ class TemplateAddWidgetAddFromTemplateWithAfterParamTest extends TemplatesIntona
 
 
 
-class TemplatesAddWidgetPreviewDispatchTest extends TemplatesIntonationTestCase {
+class TemplatesAddWidgetPreviewDispatchTest extends TemplateGeneralIntonationTestCase {
   const COPY_GROUP = 0;
   const ACTIVITY_GROUP = 1;
   const AGENDA_GROUP = 2;
diff --git a/tests/scenarios/Templates/TemplatesAdvancedSearchTest.php b/tests/scenarios/Templates/TemplatesAdvancedSearchTest.php
index d97429e1231478206389d4c04a38d7bf39dd34c5..41c8455baf56b52d17a1af51612f0813309fdeb1 100644
--- a/tests/scenarios/Templates/TemplatesAdvancedSearchTest.php
+++ b/tests/scenarios/Templates/TemplatesAdvancedSearchTest.php
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 abstract class TemplatesAdvancedSearchTestCase extends Admin_AbstractControllerTestCase {
   protected $_storm_default_to_volatile = true;
@@ -101,7 +101,7 @@ class TemplatesAdvancedSearchWithProfilRedirectTest extends TemplatesAdvancedSea
 
 
 
-class TemplatesDispatchIntonationAdvancedSearchTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationAdvancedSearchTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
diff --git a/tests/scenarios/Templates/TemplatesAuthLoginTest.php b/tests/scenarios/Templates/TemplatesAuthLoginTest.php
index 900140df1fed6db05c9b80230c98a474a63c4a73..e1a3614b8e9f02ddd917de26538bbfd3ff8fc1b2 100644
--- a/tests/scenarios/Templates/TemplatesAuthLoginTest.php
+++ b/tests/scenarios/Templates/TemplatesAuthLoginTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 
-class TemplatesAuthLoginWithIdentityProviderTest extends TemplatesIntonationTestCase {
+class TemplatesAuthLoginWithIdentityProviderTest extends TemplateGeneralIntonationTestCase {
   /** @test */
   public function formActionShouldContainProvider() {
     Zendafi_Auth::getInstance()->clearIdentity();
@@ -34,7 +34,7 @@ class TemplatesAuthLoginWithIdentityProviderTest extends TemplatesIntonationTest
 
 
 
-class TemplatesAuthLoginWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesAuthLoginWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -76,4 +76,4 @@ class TemplatesAuthLoginWidgetTest extends TemplatesIntonationTestCase {
   public function loginHeaderShouldHaveClassCol12() {
     $this->assertXPathContentContains('//h2[@class="login_header col-12"]', 'Se connecter');
   }
-}
\ No newline at end of file
+}
diff --git a/tests/scenarios/Templates/TemplatesAuthorTest.php b/tests/scenarios/Templates/TemplatesAuthorTest.php
index 6524b9f672e2f81cd0f9c61c9142a58fc8c9c332..6a3d76c54ae2653c7169fe11ae7dde15e6a8c082 100644
--- a/tests/scenarios/Templates/TemplatesAuthorTest.php
+++ b/tests/scenarios/Templates/TemplatesAuthorTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
 
-class TemplatesAuthorEditWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesAuthorEditWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -40,7 +40,7 @@ class TemplatesAuthorEditWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesAuthorWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesAuthorWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -127,7 +127,7 @@ class TemplatesAuthorWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-abstract class TemplatesIntonationWithAuthorTest extends TemplatesIntonationTestCase {
+abstract class TemplatesIntonationWithAuthorTest extends TemplateGeneralIntonationTestCase {
 
   protected $_http_client;
 
diff --git a/tests/scenarios/Templates/TemplatesBorrowerTest.php b/tests/scenarios/Templates/TemplatesBorrowerTest.php
index 5ab8031ba61727ff9f3632476b55ff5042128496..f9a21f9770764a0dbfb356de8ef78464bdc3f493 100644
--- a/tests/scenarios/Templates/TemplatesBorrowerTest.php
+++ b/tests/scenarios/Templates/TemplatesBorrowerTest.php
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 /* @see : https://forge.afi-sa.net/issues/202507 */
-class TemplatesBorrowerWithPagesLoansTest extends TemplatesIntonationTestCase
+class TemplatesBorrowerWithPagesLoansTest extends TemplateGeneralIntonationTestCase
 {
 
-  public function setUp(): void  
+  public function setUp(): void
   {
     parent::setUp();
 
diff --git a/tests/scenarios/Templates/TemplatesBreadcrumbTest.php b/tests/scenarios/Templates/TemplatesBreadcrumbTest.php
index cadc4b06db11d1cd8278c549a5a849dbae9dd937..e0420f66567842b7f6b1c4666195dceb91b16285 100644
--- a/tests/scenarios/Templates/TemplatesBreadcrumbTest.php
+++ b/tests/scenarios/Templates/TemplatesBreadcrumbTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
-class TemplatesBreadcrumbTestDispatchSearchTest extends TemplatesIntonationTestCase {
+class TemplatesBreadcrumbTestDispatchSearchTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -59,7 +59,7 @@ class TemplatesBreadcrumbTestDispatchSearchTest extends TemplatesIntonationTestC
 
 
 
-class TemplatesDispatchEditBreadcrumbWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchEditBreadcrumbWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
diff --git a/tests/scenarios/Templates/TemplatesDispatchIntonationScriptsTest.php b/tests/scenarios/Templates/TemplatesDispatchIntonationScriptsTest.php
index a9fe4fbe553d696514f4bedafd81de86638c2cd3..fe142890980611c0fb35d401f038139fee5a2d62 100644
--- a/tests/scenarios/Templates/TemplatesDispatchIntonationScriptsTest.php
+++ b/tests/scenarios/Templates/TemplatesDispatchIntonationScriptsTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
-class TemplatesDispatchIntonationScriptsTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationScriptsTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     Class_AdminVar::newInstanceWithId('JS_STAT', ['valeur' => "<script> var _gaq = _gaq ||
@@ -54,4 +54,4 @@ class TemplatesDispatchIntonationScriptsTest extends TemplatesIntonationTestCase
   public function JSSTATshouldAppearOnlyOnce() {
     $this->assertXPathCount('//script[contains(text(), "UA-41754005-1")]', 1);
   }
-}
\ No newline at end of file
+}
diff --git a/tests/scenarios/Templates/TemplatesExpertFormTest.php b/tests/scenarios/Templates/TemplatesExpertFormTest.php
index 7b541d30cbc98cfcb9c6b5500dfee428ab0d974d..90cee3995790c8256eedd2a731792b1a2a0c11b0 100644
--- a/tests/scenarios/Templates/TemplatesExpertFormTest.php
+++ b/tests/scenarios/Templates/TemplatesExpertFormTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
-class TemplatesExpertFormDispatchTest extends TemplatesIntonationTestCase {
+class TemplatesExpertFormDispatchTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     Class_Profil::setCurrentProfil(Class_Profil::find(2));
@@ -50,7 +50,7 @@ class TemplatesExpertFormDispatchTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesExpertIndexDispatchTest extends TemplatesIntonationTestCase {
+class TemplatesExpertIndexDispatchTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     Class_Profil::setCurrentProfil(Class_Profil::find(2));
@@ -67,7 +67,7 @@ class TemplatesExpertIndexDispatchTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesExpertFormSearchDispatchTest extends TemplatesIntonationTestCase {
+class TemplatesExpertFormSearchDispatchTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void
   {
diff --git a/tests/scenarios/Templates/TemplatesFormTest.php b/tests/scenarios/Templates/TemplatesFormTest.php
index 800280545fff93181a5690f949ee6f1182b2918d..e455ebd333bbaffc1e2ba6ef3c5c75daa454c434 100644
--- a/tests/scenarios/Templates/TemplatesFormTest.php
+++ b/tests/scenarios/Templates/TemplatesFormTest.php
@@ -18,11 +18,11 @@
  * along with BOKEH; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 require_once 'tests/fixtures/KohaFixtures.php';
 
 abstract class TemplatesFormPreRegistrationTestCase
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
   public $mock_transport;
   public $mock_web_client;
   protected $_storm_default_to_volatile = true;
diff --git a/tests/scenarios/Templates/TemplatesIndexTest.php b/tests/scenarios/Templates/TemplatesIndexTest.php
index da956c3a7a4ab8ab5e5067c96dbb81ed13bca986..5c90b201a5748d9c72454bad5fa396816cde9821 100644
--- a/tests/scenarios/Templates/TemplatesIndexTest.php
+++ b/tests/scenarios/Templates/TemplatesIndexTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
-class TemplatesIndexTest extends TemplatesIntonationTestCase {
+class TemplatesIndexTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -47,7 +47,7 @@ class TemplatesIndexTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesIndexBodyIpAddressTest extends TemplatesIntonationTestCase {
+class TemplatesIndexBodyIpAddressTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     $_SERVER['REMOTE_ADDR'] = '10.0.0.1';
diff --git a/tests/scenarios/Templates/TemplatesLibraryTest.php b/tests/scenarios/Templates/TemplatesLibraryTest.php
index 344bd4767efe477a1a5f720c29299258a58a30a9..0b8bddfec7c085a8dec29890533444695442aebc 100644
--- a/tests/scenarios/Templates/TemplatesLibraryTest.php
+++ b/tests/scenarios/Templates/TemplatesLibraryTest.php
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
 abstract class TemplatesLibraryTestCase extends AbstractControllerTestCase {
 
@@ -600,7 +600,7 @@ class TemplatesLibraryWithBookmarksEnabledTest extends TemplatesLibraryWithLibra
 
 
 
-class TemplatesLibraryWidgetWithOSMAndLinkToProfileTest extends TemplatesIntonationTestCase {
+class TemplatesLibraryWidgetWithOSMAndLinkToProfileTest extends TemplateGeneralIntonationTestCase {
   use Trait_ManageCustomFields;
 
   public function setUp(): void
@@ -733,7 +733,7 @@ class TemplatesLibraryWidgetWithOSMAndLinkToProfileTest extends TemplatesIntonat
 
 
 
-class TemplatesLibraryWidgetConfigurationWithOsmTest extends TemplatesIntonationTestCase {
+class TemplatesLibraryWidgetConfigurationWithOsmTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
 
diff --git a/tests/scenarios/Templates/TemplatesMenuTest.php b/tests/scenarios/Templates/TemplatesMenuTest.php
index 2200efaadc6125c7ac4ba1728cafa617a8703ecd..eb6ba77ba5b6578c3a9e685e1bdefc80e052bf32 100644
--- a/tests/scenarios/Templates/TemplatesMenuTest.php
+++ b/tests/scenarios/Templates/TemplatesMenuTest.php
@@ -18,10 +18,10 @@
  * along with BOKEH; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 
-class TemplatesMenuDispatchEditMenuHTest extends TemplatesIntonationTestCase {
+class TemplatesMenuDispatchEditMenuHTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -63,7 +63,7 @@ class TemplatesMenuDispatchEditMenuHTest extends TemplatesIntonationTestCase {
 
 
 
-abstract class TemplatesMenuUrlTestCase extends TemplatesIntonationTestCase {
+abstract class TemplatesMenuUrlTestCase extends TemplateGeneralIntonationTestCase {
   public function setUp(): void  {
     parent::setUp();
 
@@ -155,7 +155,7 @@ class TemplatesMenuUrlEditTest extends TemplatesMenuUrlTestCase {
 
 
 
-class TemplatesMenuDispatchIndexTest extends TemplatesIntonationTestCase {
+class TemplatesMenuDispatchIndexTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -178,7 +178,7 @@ class TemplatesMenuDispatchIndexTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesMenuUrlProfilTestCase extends TemplatesIntonationTestCase {
+class TemplatesMenuUrlProfilTestCase extends TemplateGeneralIntonationTestCase {
   public function setUp(): void  {
     parent::setUp();
 
diff --git a/tests/scenarios/Templates/TemplatesNotifyTest.php b/tests/scenarios/Templates/TemplatesNotifyTest.php
index ae0f2da37ac976a7d29e626fc9b359b85583f612..7988c1e7cb83bb1b66c532e015b4dec7a953ed97 100644
--- a/tests/scenarios/Templates/TemplatesNotifyTest.php
+++ b/tests/scenarios/Templates/TemplatesNotifyTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
-class TemplatesDispatchEditNotifyWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchEditNotifyWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -38,7 +38,7 @@ class TemplatesDispatchEditNotifyWidgetTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesDispatchIntonationWithNotificationsTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationWithNotificationsTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -57,7 +57,7 @@ class TemplatesDispatchIntonationWithNotificationsTest extends TemplatesIntonati
 
 
 
-class TemplatesDispatchIntonationWithScriptTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationWithScriptTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     (new ZendAfi_Controller_Action_Helper_FlashMessenger)->addScript('alert("Hello bokeh")');
@@ -70,4 +70,4 @@ class TemplatesDispatchIntonationWithScriptTest extends TemplatesIntonationTestC
   public function headShouldContainsScriptAlertHelloBokeh() {
     $this->assertXPathContentContains('//script', 'alert("Hello bokeh")');
   }
-}
\ No newline at end of file
+}
diff --git a/tests/scenarios/Templates/TemplatesReviewsTest.php b/tests/scenarios/Templates/TemplatesReviewsTest.php
index 5dfdd071921be2f196198a10a236cfde5a6188c2..32afbe1d6e376e67d267788e4330c4444c36e014 100644
--- a/tests/scenarios/Templates/TemplatesReviewsTest.php
+++ b/tests/scenarios/Templates/TemplatesReviewsTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
-class TemplatesReviewsAddTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsAddTest extends TemplateGeneralIntonationTestCase {
 
   protected $_review;
 
@@ -70,7 +70,7 @@ class TemplatesReviewsAddTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesReviewsAddAjaxTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsAddAjaxTest extends TemplateGeneralIntonationTestCase {
 
   protected $_review;
 
@@ -119,7 +119,7 @@ class TemplatesReviewsAddAjaxTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesReviewsEditWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsEditWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -137,7 +137,7 @@ class TemplatesReviewsEditWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesReviewsWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -186,7 +186,7 @@ class TemplatesReviewsWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesReviewsBlogActionTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsBlogActionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -262,7 +262,7 @@ class TemplatesReviewsBlogActionTest extends TemplatesIntonationTestCase {
 
 
 
-abstract class TemplatesReviewsBlogReadMoreActionTestCase extends TemplatesIntonationTestCase {
+abstract class TemplatesReviewsBlogReadMoreActionTestCase extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -383,7 +383,7 @@ class TemplatesReviewsBlogReadMoreActionWithoutLinkedUserNorRecordTest
 
 
 
-abstract class TemplatesReviewsActionTestCase extends TemplatesIntonationTestCase {
+abstract class TemplatesReviewsActionTestCase extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -563,7 +563,7 @@ class TemplatesReviewsActionPatronNotLoggedTest
 
 
 
-class TemplatesReviewsEditActionTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsEditActionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -601,7 +601,7 @@ class TemplatesReviewsEditActionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesReviewsDeleteReviewsActionTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsDeleteReviewsActionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -899,7 +899,7 @@ next line');
 
 
 
-class TemplatesReviewsDonnerDesAvisTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsDonnerDesAvisTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
diff --git a/tests/scenarios/Templates/TemplatesSearchFacetsTest.php b/tests/scenarios/Templates/TemplatesSearchFacetsTest.php
index 32fb52f3a29c9aca4e8e4adc5764855135ecb329..0babc158ad428579b196cf8ce1d132fea8d0956c 100644
--- a/tests/scenarios/Templates/TemplatesSearchFacetsTest.php
+++ b/tests/scenarios/Templates/TemplatesSearchFacetsTest.php
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 /* hotline: https://forge.afi-sa.net/issues/138829 */
 class TemplatesSearchFacetsTest extends AbstractControllerTestCase {
diff --git a/tests/scenarios/Templates/TemplatesSearchItemsTest.php b/tests/scenarios/Templates/TemplatesSearchItemsTest.php
index 9b9546e0f49d6bed81736fcbba19fb513306ec12..00ac08d74557fb75ad087f943915a6ea78043e7c 100644
--- a/tests/scenarios/Templates/TemplatesSearchItemsTest.php
+++ b/tests/scenarios/Templates/TemplatesSearchItemsTest.php
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
 abstract class TemplatesTestSearchItemsTestCase
   extends Admin_AbstractControllerTestCase {
@@ -873,7 +873,7 @@ class TemplatesSearchItemsEbookWithHTTPSUrlTest
 
 
 
-class TemplatesSearchItemsReserverActionPopupTest extends TemplatesIntonationTestCase {
+class TemplatesSearchItemsReserverActionPopupTest extends TemplateGeneralIntonationTestCase {
 
   protected
     $_uniqids = [],
@@ -938,7 +938,7 @@ class TemplatesSearchItemsReserverActionPopupTest extends TemplatesIntonationTes
 
 
 
-class TemplatesSearchItemsRechercheReserverWithoutRecordIdTest extends TemplatesIntonationTestCase {
+class TemplatesSearchItemsRechercheReserverWithoutRecordIdTest extends TemplateGeneralIntonationTestCase {
 
 
   public function setUp(): void   {
@@ -963,7 +963,7 @@ class TemplatesSearchItemsRechercheReserverWithoutRecordIdTest extends Templates
 
 
 
-class TemplatesSearchItemsRechercheReserverWithRecordWithoutItemsTest extends TemplatesIntonationTestCase {
+class TemplatesSearchItemsRechercheReserverWithRecordWithoutItemsTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void
   {
diff --git a/tests/scenarios/Templates/TemplatesSearchTest.php b/tests/scenarios/Templates/TemplatesSearchTest.php
index 3055fd99009594079ef3422b7c3742527c4b2847..a3d32ae17702073d701e0dd765a94c33a37f1523 100644
--- a/tests/scenarios/Templates/TemplatesSearchTest.php
+++ b/tests/scenarios/Templates/TemplatesSearchTest.php
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 abstract class TemplatesSearchWithSortParameterInWidgetTestCase
   extends AbstractControllerTestCase {
@@ -155,7 +155,7 @@ class TemplatesSearchWithSortParameterInWidgetFromSearchPageWithPostParamsTest
 
 
 
-class TemplatesDispatchIntonationSearchTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationSearchTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -331,7 +331,7 @@ class TemplatesSearchPostDispatchWithCustomMultifactesTest extends AbstractContr
 
 
 
-class TemplatesSearchViewRecordTest extends TemplatesIntonationTestCase {
+class TemplatesSearchViewRecordTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -518,7 +518,7 @@ class TemplatesSearchViewRecordTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesSearchRecordsTest extends TemplatesIntonationTestCase {
+class TemplatesSearchRecordsTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -543,7 +543,7 @@ class TemplatesSearchRecordsTest extends TemplatesIntonationTestCase {
 
 
 abstract class TemplatesSearchDispatchIntonationSearchListFormatWallTestCase
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1638,7 +1638,7 @@ class TemplatesSearchWithDomainIdsSettingsFromIndexPageTest
 
 
 
-class TemplatesDispatchIntonationSearchWithXslTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationSearchWithXslTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1780,7 +1780,7 @@ class TemplatesSearchBackToFormTest extends AbstractControllerTestCase {
 
 
 /* see https://forge.afi-sa.net/issues/185768 */
-class TemplatesSearchReserverActionTest extends TemplatesIntonationTestCase {
+class TemplatesSearchReserverActionTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
diff --git a/tests/scenarios/Templates/TemplatesSectionTest.php b/tests/scenarios/Templates/TemplatesSectionTest.php
index ff41b6ed2d2d68e5e6dccd3708f0beaba3eb947e..4f0608d3e2ca412085351e0e6c88974f8a69e09a 100644
--- a/tests/scenarios/Templates/TemplatesSectionTest.php
+++ b/tests/scenarios/Templates/TemplatesSectionTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 /** @see http://forge.afi-sa.fr/issues/115136 */
-class TemplatesSectionAdminToolsTest extends TemplatesIntonationTestCase {
+class TemplatesSectionAdminToolsTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function withMenuAtPositionZeroShouldDisplaySectionAdminTools() {
diff --git a/tests/scenarios/Templates/TemplatesShareTest.php b/tests/scenarios/Templates/TemplatesShareTest.php
index cd76920784a16499f2c15367f04a0016d10db857..00c16bf6e5ee54a348ee5b4e3d12248f3822c4c2 100644
--- a/tests/scenarios/Templates/TemplatesShareTest.php
+++ b/tests/scenarios/Templates/TemplatesShareTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
-class TemplatesDispatchEditShareWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchEditShareWidgetTest extends TemplateGeneralIntonationTestCase {
   public function setUp(): void   {
     parent::setUp();
     $this->dispatch('/admin/widget/edit-widget/id/12/id_profil/72', true);
@@ -37,7 +37,7 @@ class TemplatesDispatchEditShareWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchIntonationWithShareTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationWithShareTest extends TemplateGeneralIntonationTestCase {
   /** @test */
   public function facebookImageShouldBePresent() {
     $this->dispatch('/opac/index/index/id_profil/72', true);
diff --git a/tests/scenarios/Templates/TemplatesWidgetIdentityProvidersTest.php b/tests/scenarios/Templates/TemplatesWidgetIdentityProvidersTest.php
index ade229f98e9b64740f4ffd602ac9fc21e0fe2046..b176b262f95e3fa4dbaa36c231f28813d4e476ed 100644
--- a/tests/scenarios/Templates/TemplatesWidgetIdentityProvidersTest.php
+++ b/tests/scenarios/Templates/TemplatesWidgetIdentityProvidersTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 
-class TemplatesWidgetIdentityProvidersTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetIdentityProvidersTest extends TemplateGeneralIntonationTestCase {
   /** @test */
   public function shouldContainBootstrapedButton() {
     Class_AdminVar::set('ENABLE_IDENTITY_PROVIDERS', 1);
diff --git a/tests/scenarios/Templates/TemplatesWidgetInMenusTest.php b/tests/scenarios/Templates/TemplatesWidgetInMenusTest.php
index be66995d4dcfdb8ac57f7017dc017d06146b3b62..a65cc09799de5f138b167e0660a4a34d935d76c2 100644
--- a/tests/scenarios/Templates/TemplatesWidgetInMenusTest.php
+++ b/tests/scenarios/Templates/TemplatesWidgetInMenusTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
 /** @see http://forge.afi-sa.fr/issues/116552 */
-class TemplatesWidgetInMenusNewsletterLoggedOutTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetInMenusNewsletterLoggedOutTest extends TemplateGeneralIntonationTestCase {
   /** @test */
   public function pageShouldContainswidgetNewsletterInMenu() {
     // widgets in menu is an activable feature, otherwise widget are ignored in menu rendering
diff --git a/tests/scenarios/Templates/TemplatesWidgetRecordsTest.php b/tests/scenarios/Templates/TemplatesWidgetRecordsTest.php
index a8885ed31402f4764125facbb4f214eacdd069ec..62fbf174203bc2bc47165516260f8db14417432a 100644
--- a/tests/scenarios/Templates/TemplatesWidgetRecordsTest.php
+++ b/tests/scenarios/Templates/TemplatesWidgetRecordsTest.php
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'TemplatesTest.php';
+require_once 'TemplateGeneralTest.php';
 
-class TemplatesWidgetRecordsAdminTest extends TemplatesIntonationTestCase
+class TemplatesWidgetRecordsAdminTest extends TemplateGeneralIntonationTestCase
 {
 
   public function setUp(): void
@@ -49,7 +49,7 @@ class TemplatesWidgetRecordsAdminTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesWidgetRecordsFrontViewLinkModeTest extends TemplatesIntonationTestCase
+class TemplatesWidgetRecordsFrontViewLinkModeTest extends TemplateGeneralIntonationTestCase
 {
 
   public function setUp(): void
@@ -255,7 +255,7 @@ class TemplatesWidgetRecordsFrontViewLinkModeTest extends TemplatesIntonationTes
 
 
 
-class TemplatesWidgetRecordsFrontTest extends TemplatesIntonationTestCase
+class TemplatesWidgetRecordsFrontTest extends TemplateGeneralIntonationTestCase
 {
 
   public function setUp(): void
@@ -319,7 +319,7 @@ class TemplatesWidgetRecordsFrontTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesWidgetRecordsFrontMultipleCarouselTest extends TemplatesIntonationTestCase
+class TemplatesWidgetRecordsFrontMultipleCarouselTest extends TemplateGeneralIntonationTestCase
 {
 
   public function setUp(): void
@@ -385,7 +385,7 @@ class TemplatesWidgetRecordsFrontMultipleCarouselTest extends TemplatesIntonatio
 
 
 
-class TemplatesWidgetRecordsRenderWidgetTest extends TemplatesIntonationTestCase
+class TemplatesWidgetRecordsRenderWidgetTest extends TemplateGeneralIntonationTestCase
 {
 
   public function setUp(): void
@@ -414,7 +414,7 @@ class TemplatesWidgetRecordsRenderWidgetTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesWidgetRecordsWithPanierTest extends TemplatesIntonationTestCase
+class TemplatesWidgetRecordsWithPanierTest extends TemplateGeneralIntonationTestCase
 {
 
   protected array $_storm_scopes = ['Intonation_Library_Widget_Carousel_Record_View'];
diff --git a/tests/scenarios/Templates/TemplatesWidgetTest.php b/tests/scenarios/Templates/TemplatesWidgetTest.php
index f22d1016b1beadd63b495561766a7d457993048c..2383b0a36d2dae06b9a71d669ffcad10f735e316 100644
--- a/tests/scenarios/Templates/TemplatesWidgetTest.php
+++ b/tests/scenarios/Templates/TemplatesWidgetTest.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once('TemplatesTest.php');
+require_once('TemplateGeneralTest.php');
 
 
-class TemplatesWidgetsNewsletterTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetsNewsletterTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function newsletterWidgetShouldBePresent() {
@@ -75,7 +75,7 @@ class TemplatesWidgetsNewsletterTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesWidgetMenuTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetMenuTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function menuWidgetShouldBePresent() {
@@ -94,7 +94,7 @@ class TemplatesWidgetMenuTest extends TemplatesIntonationTestCase {
 
 
 
-abstract class TemplatesWidgetRenderAllTestCase extends TemplatesIntonationTestCase {
+abstract class TemplatesWidgetRenderAllTestCase extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -338,7 +338,7 @@ class TemplatesWidgetFilterTest extends TemplatesWidgetRenderAllTestCase {
 
 
 
-class TemplatesWidgetRssTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetRssTest extends TemplateGeneralIntonationTestCase {
 
   protected $_response;
   protected $_record_id;
@@ -445,7 +445,7 @@ class TemplatesWidgetRssTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesWidgetHiddenTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetHiddenTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -472,7 +472,7 @@ class TemplatesWidgetHiddenTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesWidgetSearchSettingsFormTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetSearchSettingsFormTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -490,7 +490,7 @@ class TemplatesWidgetSearchSettingsFormTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesWidgetSearchInlineStyleTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetSearchInlineStyleTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -566,7 +566,7 @@ class TemplatesWidgetSearchInlineStyleTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesWidgetSearchToggleStyleTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetSearchToggleStyleTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -618,7 +618,7 @@ class TemplatesWidgetSearchToggleStyleTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesWidgetSearchDefaultStyleTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetSearchDefaultStyleTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -734,7 +734,7 @@ class TemplatesWidgetSearchDefaultStyleTest extends TemplatesIntonationTestCase
 
 
 
-class TemplatesImageWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesImageWidgetTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function editImageWidgetShouldContainsImage() {
@@ -770,7 +770,7 @@ class TemplatesImageWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesAdminToolsWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesAdminToolsWidgetTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function editAdminWidgetShouldContainsTitre() {
@@ -789,7 +789,7 @@ class TemplatesAdminToolsWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesCreditsWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesCreditsWidgetTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function editCreditsWidgetShouldContainsTitre() {
@@ -808,7 +808,7 @@ class TemplatesCreditsWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesScrollWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesScrollWidgetTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function editScrollWidgetShouldContainsTop() {
@@ -827,7 +827,7 @@ class TemplatesScrollWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchLibraryWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchLibraryWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -915,7 +915,7 @@ class TemplatesDispatchLibraryWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchLibraryAgendaWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchLibraryAgendaWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -967,7 +967,7 @@ class TemplatesDispatchLibraryAgendaWidgetTest extends TemplatesIntonationTestCa
 
 
 
-class TemplatesDispatchDomainWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchDomainWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void
   {
@@ -998,7 +998,7 @@ class TemplatesDispatchDomainWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesDispatchIntonationWithDomainWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchIntonationWithDomainWidgetTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function facebookImageShouldBePresent() {
@@ -1015,7 +1015,7 @@ class TemplatesDispatchIntonationWithDomainWidgetTest extends TemplatesIntonatio
 
 
 
-class TemplatesDispatchAdminWidgetEditActionTest extends TemplatesIntonationTestCase {
+class TemplatesDispatchAdminWidgetEditActionTest extends TemplateGeneralIntonationTestCase {
 
   /** @test */
   public function dispatchModuleShouldContainsExpectation() {
@@ -1088,7 +1088,7 @@ class TemplatesDispatchAdminWidgetEditActionTest extends TemplatesIntonationTest
 
 
 class TemplatesDispatchAdminWidgetEditActionRechercheViewNoticeTest
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1144,7 +1144,7 @@ class TemplatesDispatchAdminWidgetEditActionRechercheViewNoticeTest
 
 
 class TemplatesDispatchAdminWidgetEditActionRechercheViewNoticePerArticleTest
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();
@@ -1170,7 +1170,7 @@ class TemplatesDispatchAdminWidgetEditActionRechercheViewNoticePerArticleTest
 
 
 class TemplatesDispatchAdminWidgetEditActionRechercheViewNoticeActivationTest
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
 
   public function checkboxInputNames() {
     return [
@@ -1220,7 +1220,7 @@ class TemplatesDispatchAdminWidgetEditActionRechercheViewNoticeActivationTest
 
 
 class TemplatesDispatchAdminWidgetActionRechercheViewNoticePostTest
-  extends TemplatesIntonationTestCase {
+  extends TemplateGeneralIntonationTestCase {
 
   protected $_prefs;
 
@@ -1702,7 +1702,7 @@ class TemplatesWidgetWithTopHighlightLayoutAndCycleTest
 
 
 
-class TemplatesWidgetEditUnknownWidgetTest extends TemplatesIntonationTestCase {
+class TemplatesWidgetEditUnknownWidgetTest extends TemplateGeneralIntonationTestCase {
 
   public function setUp(): void   {
     parent::setUp();