diff --git a/lib/library_helper.rb b/lib/library_helper.rb
index d681845..dfb0953 100644
--- a/lib/library_helper.rb
+++ b/lib/library_helper.rb
@@ -1,4 +1,6 @@
-module LibraryHelper
+class LibraryHelper < DynamicTableHelper
+  MODEL_NAME = "library"
+
   def self.list_library new_libraries
     return [] if new_libraries.nil? or new_libraries.length == 0
     list_libraries = []
@@ -57,4 +59,4 @@ module LibraryHelper
   def self.add_dynamic_table
     libraries_as_tables(nil).first.call
   end
-end
+end
\ No newline at end of file
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 1a96eaa..9408b68 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -38,18 +38,21 @@ class SearchControllerTest < ActionController::TestCase
       "66.544.314/0001-63"
       )
 
-     get :communities, :query => "New"
+    get :communities, :query => "New"
 
-     assert_includes assigns(:searches)[:communities][:results], community
-     assert_not_includes assigns(:searches)[:communities][:results], software
-     assert_not_includes assigns(:searches)[:communities][:results], institution
-   end
+    assert_includes assigns(:searches)[:communities][:results], community
+    assert_not_includes assigns(:searches)[:communities][:results], software
+    assert_not_includes assigns(:searches)[:communities][:results], institution
+  end
 
    should "software_infos search don't have community or institution" do
      community = create_community("New Community")
      software = create_software_info("New Software")
      institution = create_private_institution("New Private Institution", "NPI" , "Brazil", "DF", "Gama", "66.544.314/0001-63")
 
+     software.license_info = LicenseInfo.create :version=>"GPL - 1.0"
+     software.save!
+
      get :software_infos, :query => "New"
 
      assert_includes assigns(:searches)[:software_infos][:results], software.community
@@ -57,31 +60,6 @@ class SearchControllerTest < ActionController::TestCase
      assert_not_includes assigns(:searches)[:software_infos][:results], institution.community
    end
 
-   should "software_infos search by category" do
-     software_with_category = create_software_info("New Software With Category")
-     software_without_category = create_software_info("New Software Without Category")
-     category = Category.create!(:name => "Health", :environment => @environment, :parent => @category_software)
-
-     software_with_category.community.categories << category
-     software_with_category.save!
-
-     get :software_infos, :query => "New", :filter => category.id
-
-     assert_includes assigns(:searches)[:software_infos][:results], software_with_category.community
-     assert_not_includes assigns(:searches)[:software_infos][:results], software_without_category.community
-   end
-
-   should "institutions_search don't have community or software" do
-     community = create_community("New Community")
-     software = create_software_info("New Software")
-     institution = create_private_institution("New Private Institution", "NPI" , "Brazil", "DF", "Gama", "66.544.314/0001-63")
-
-     get :institutions, :query => "New"
-
-     assert_includes assigns(:searches)[:institutions][:results], institution.community
-     assert_not_includes assigns(:searches)[:institutions][:results], community
-     assert_not_includes assigns(:searches)[:institutions][:results], software.community
-   end
 
   should "Don't found template in communities search" do
     community = create_community("New Community")
@@ -104,52 +82,14 @@ class SearchControllerTest < ActionController::TestCase
 
     get :communities, :query => "New"
 
-    assert_includes(
-      assigns(:searches)[:software_infos][:results],
-      software.community
-    )
-    assert_not_includes assigns(:searches)[:software_infos][:results], community
-    assert_not_includes(
-      assigns(:searches)[:software_infos][:results],
-      institution.community
-    )
-  end
-
-  should "software_infos search by category" do
-    software_with_category = create_software_info("New Software With Category")
-    software_with_category.license_info = LicenseInfo.create(:version => "GPL")
-
-    software_without_category =
-      create_software_info("New Software Without Category")
-
-    software_without_category.license_info =
-      LicenseInfo.create(:version => "GPL")
-
-    category = Category.create!(
-      :name => "Health",
-      :environment => @environment,
-      :parent => @category_software
-    )
-
-    software_template = create_software_info("New Software Template")
-    software_template.license_info = LicenseInfo.last
-    software_template.community.is_template = true
-    software_template.community.save!
-    software_template.save!
-
-    get :software_infos, :query => "New"
-
-    assert_includes(
-      assigns(:searches)[:software_infos][:results],
-      software_with_category.community
-    )
     assert_not_includes(
-      assigns(:searches)[:software_infos][:results],
-      software_without_category.community
+      assigns(:searches)[:communities][:results],
+      community_template
     )
   end
 
   should "institutions_search don't have community or software" do
+
     community = create_community("New Community")
     software = create_software_info("New Software")
     institution = create_private_institution(
--
libgit2 0.21.2