diff --git a/library/ZendAfi/Controller/Plugin/ResourceDefinition/SearchForm.php b/library/ZendAfi/Controller/Plugin/ResourceDefinition/SearchForm.php
index f035e2be282666354d014e758d1f6609d0863275..991c41955403abb7fd7ca2f8bb114c639b589440 100644
--- a/library/ZendAfi/Controller/Plugin/ResourceDefinition/SearchForm.php
+++ b/library/ZendAfi/Controller/Plugin/ResourceDefinition/SearchForm.php
@@ -20,7 +20,8 @@
  */
 
 
-class ZendAfi_Controller_Plugin_ResourceDefinition_SearchForm extends ZendAfi_Controller_Plugin_ResourceDefinition_Abstract {
+class ZendAfi_Controller_Plugin_ResourceDefinition_SearchForm
+  extends ZendAfi_Controller_Plugin_ResourceDefinition_Abstract {
 
   public function getDefinitions() {
     return ['model' => ['class' => 'Class_SearchForm',
@@ -35,9 +36,8 @@ class ZendAfi_Controller_Plugin_ResourceDefinition_SearchForm extends ZendAfi_Co
             'actions' => ['add' => ['title' => $this->_("Ajouter un formulaire de recherche avancée")],
                           'edit' => ['title' => $this->_("Modifier un formulaire de recherche avancée")],
                           'index' => ['title' => $this->_("Formulaires de recherche avancée")]],
-            'form_class_name' => 'ZendAfi_Form_AdvancedSearch',
+
+            'form_class_name' => 'ZendAfi_Form_Admin_SearchForm',
     ];
   }
-
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/ZendAfi/Form/AdvancedSearch.php b/library/ZendAfi/Form/Admin/SearchForm.php
similarity index 89%
rename from library/ZendAfi/Form/AdvancedSearch.php
rename to library/ZendAfi/Form/Admin/SearchForm.php
index 584e6859637d65c3535a72bb65efc1ccf68d6f74..6511a8dc3b97510fd84780e26cb6ccf8fbcd79c0 100644
--- a/library/ZendAfi/Form/AdvancedSearch.php
+++ b/library/ZendAfi/Form/Admin/SearchForm.php
@@ -20,7 +20,7 @@
  */
 
 
-class ZendAfi_Form_AdvancedSearch extends ZendAfi_Form {
+class ZendAfi_Form_Admin_SearchForm extends ZendAfi_Form {
   public function init() {
     parent::init();
 
@@ -41,8 +41,6 @@ class ZendAfi_Form_AdvancedSearch extends ZendAfi_Form {
                    'visible',
                    ['label' => $this->_('Le formulaire est visible') ])
 
-      ->addUniqDisplayGroup('all',
-                        ['legend' => $this->_('Configuration du formulaire')]);
-
+      ->addUniqDisplayGroup('all', ['legend' => $this->_('Configuration du formulaire')]);
   }
 }
\ No newline at end of file
diff --git a/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php b/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php
index ac0248681ba4b9359d6e0e043873a4f875ff092e..4f2d1df68a1e76795d35b2082372bf6ebf8d7692 100644
--- a/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php
+++ b/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php
@@ -25,7 +25,7 @@ class AdvancedSearch_AdminConfigurationUnactiveTest extends   Admin_AbstractCont
 
   public function setUp() {
     parent::setUp();
-    Class_AdminVar::set('ADVANCED_SEARCH_CONFIGURABLE',0);
+    Class_AdminVar::set('ADVANCED_SEARCH_CONFIGURABLE', 0);
   }
 
 
@@ -45,12 +45,12 @@ class AdvancedSearch_AdminConfigurationUnactiveTest extends   Admin_AbstractCont
 
 
 
-class AdvancedSearch_AdminConfigurationActiveTest extends   Admin_AbstractControllerTestCase {
+class AdvancedSearch_ActiveTestCase extends Admin_AbstractControllerTestCase {
   protected $_storm_default_to_volatile = true;
 
   public function setUp() {
     parent::setUp();
-    Class_AdminVar::set('ADVANCED_SEARCH_CONFIGURABLE',1);
+    Class_AdminVar::set('ADVANCED_SEARCH_CONFIGURABLE', 1);
     $this->fixture('Class_SearchForm',
                    ['id' => 1,
                     'label' => 'Mon formulaire',
@@ -58,8 +58,11 @@ class AdvancedSearch_AdminConfigurationActiveTest extends   Admin_AbstractContro
                     'visible' => true
                    ]);
   }
+}
+
 
 
+class AdvancedSearch_AdminConfigurationSimpleActiveTest extends AdvancedSearch_ActiveTestCase {
   /** @test */
   public function menuAdvancedFormShouldBeDisplayed() {
     $this->dispatch('/admin');
@@ -96,3 +99,36 @@ class AdvancedSearch_AdminConfigurationActiveTest extends   Admin_AbstractContro
     $this->assertNull(Class_SearchForm::find(1));
   }
 }
+
+
+
+class AdvancedSearch_AdminConfigurationAddActionTest extends AdvancedSearch_ActiveTestCase {
+  public function setUp() {
+    parent::setUp();
+    $this->dispatch('/admin/search-form/add', true);
+  }
+
+
+  /** @test */
+  public function titleShouldBeAjouterUnFormulaire() {
+    $this->assertXPathContentContains('//h1', 'Ajouter un formulaire');
+  }
+
+
+  /** @test */
+  public function labelInputShouldBePresent() {
+    $this->assertXPath('//input[@name="label"]');
+  }
+
+
+  /** @test */
+  public function fileInputShouldBePresent() {
+    $this->assertXPath('//input[@name="filename"]');
+  }
+
+
+  /** @test */
+  public function visibleCheckBoxShouldBePresent() {
+    $this->assertXPath('//input[@type="checkbox"][@name="visible"]');
+  }
+}
\ No newline at end of file