diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index db56fe5..0975655 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -4,7 +4,7 @@ require 'account_controller'
 # Re-raise errors caught by the controller.
 class AccountController; def rescue_action(e) raise e end; end
 
-class AccountControllerTest < Test::Unit::TestCase
+class AccountControllerTest < ActionController::TestCase
   # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead
   # Then, you can remove it from this and the units test.
   include AuthenticatedTestHelper
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 8718122..99ea6fb 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -4,7 +4,7 @@ require 'admin_controller'
 # Re-raise errors caught by the controller.
 class AdminController; def rescue_action(e) raise e end; end
 
-class AdminControllerTest < Test::Unit::TestCase
+class AdminControllerTest < ActionController::TestCase
 
   should 'inherit from ApplicationController' do
     assert_kind_of ApplicationController, AdminController.new
diff --git a/test/functional/admin_panel_controller_test.rb b/test/functional/admin_panel_controller_test.rb
index a735ae1..be530cb 100644
--- a/test/functional/admin_panel_controller_test.rb
+++ b/test/functional/admin_panel_controller_test.rb
@@ -4,7 +4,7 @@ require 'admin_panel_controller'
 # Re-raise errors caught by the controller.
 class AdminPanelController; def rescue_action(e) raise e end; end
 
-class AdminPanelControllerTest < Test::Unit::TestCase
+class AdminPanelControllerTest < ActionController::TestCase
 
   all_fixtures
   def setup
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index fe30b6a..47e0e41 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -4,7 +4,7 @@ require 'test_controller'
 # Re-raise errors caught by the controller.
 class TestController; def rescue_action(e) raise e end; end
 
-class ApplicationControllerTest < Test::Unit::TestCase
+class ApplicationControllerTest < ActionController::TestCase
   all_fixtures
   def setup
     @controller = TestController.new
diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 690065f..a03e8d8 100644
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -4,7 +4,7 @@ require 'browse_controller'
 # Re-raise errors caught by the controller.
 class BrowseController; def rescue_action(e) raise e end; end
 
-class BrowseControllerTest < Test::Unit::TestCase
+class BrowseControllerTest < ActionController::TestCase
 
   def setup
     @controller = BrowseController.new
diff --git a/test/functional/catalog_controller_test.rb b/test/functional/catalog_controller_test.rb
index b4000ef..b548df7 100644
--- a/test/functional/catalog_controller_test.rb
+++ b/test/functional/catalog_controller_test.rb
@@ -4,7 +4,7 @@ require 'catalog_controller'
 # Re-raise errors caught by the controller.
 class CatalogController; def rescue_action(e) raise e end; end
 
-class CatalogControllerTest < Test::Unit::TestCase
+class CatalogControllerTest < ActionController::TestCase
   def setup
     @controller = CatalogController.new
     @request    = ActionController::TestRequest.new
diff --git a/test/functional/categories_controller_test.rb b/test/functional/categories_controller_test.rb
index 8d1444a..153951c 100644
--- a/test/functional/categories_controller_test.rb
+++ b/test/functional/categories_controller_test.rb
@@ -4,7 +4,7 @@ require 'categories_controller'
 # Re-raise errors caught by the controller.
 class CategoriesController; def rescue_action(e) raise e end; end
 
-class CategoriesControllerTest < Test::Unit::TestCase
+class CategoriesControllerTest < ActionController::TestCase
   all_fixtures
   def setup
     @controller = CategoriesController.new
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 35c1688..138dd0c 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -4,7 +4,7 @@ require 'cms_controller'
 # Re-raise errors caught by the controller.
 class CmsController; def rescue_action(e) raise e end; end
 
-class CmsControllerTest < Test::Unit::TestCase
+class CmsControllerTest < ActionController::TestCase
 
   fixtures :environments
 
diff --git a/test/functional/contact_controller_test.rb b/test/functional/contact_controller_test.rb
index 9ae51b2..966201f 100644
--- a/test/functional/contact_controller_test.rb
+++ b/test/functional/contact_controller_test.rb
@@ -4,7 +4,7 @@ require 'contact_controller'
 # Re-raise errors caught by the controller.
 class ContactController; def rescue_action(e) raise e end; end
 
-class ContactControllerTest < Test::Unit::TestCase
+class ContactControllerTest < ActionController::TestCase
 
   all_fixtures
 
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index ad00715..d9aaddf 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -4,7 +4,7 @@ require 'content_viewer_controller'
 # Re-raise errors caught by the controller.
 class ContentViewerController; def rescue_action(e) raise e end; end
 
-class ContentViewerControllerTest < Test::Unit::TestCase
+class ContentViewerControllerTest < ActionController::TestCase
 
   all_fixtures
 
diff --git a/test/functional/edit_template_controller_test.rb b/test/functional/edit_template_controller_test.rb
index fb096f2..056603b 100644
--- a/test/functional/edit_template_controller_test.rb
+++ b/test/functional/edit_template_controller_test.rb
@@ -6,7 +6,7 @@ require 'edit_template_controller'
 # Re-raise errors caught by the controller.
 class EditTemplateController; def rescue_action(e) raise e end; end
 
-class EditTemplateControllerTest < Test::Unit::TestCase
+class EditTemplateControllerTest < ActionController::TestCase
   all_fixtures
   def setup
     @controller = EditTemplateController.new
diff --git a/test/functional/enterprise_registration_controller_test.rb b/test/functional/enterprise_registration_controller_test.rb
index e7fe298..f7ee46d 100644
--- a/test/functional/enterprise_registration_controller_test.rb
+++ b/test/functional/enterprise_registration_controller_test.rb
@@ -4,7 +4,7 @@ require 'enterprise_registration_controller'
 # Re-raise errors caught by the controller.
 class EnterpriseRegistrationController; def rescue_action(e) raise e end; end
 
-class EnterpriseRegistrationControllerTest < Test::Unit::TestCase
+class EnterpriseRegistrationControllerTest < ActionController::TestCase
 
 #  all_fixtures:users
 all_fixtures
diff --git a/test/functional/enterprise_validation_controller_test.rb b/test/functional/enterprise_validation_controller_test.rb
index 66f64d8..8544c6d 100644
--- a/test/functional/enterprise_validation_controller_test.rb
+++ b/test/functional/enterprise_validation_controller_test.rb
@@ -4,7 +4,7 @@ require 'enterprise_validation_controller'
 # Re-raise errors caught by the controller.
 class EnterpriseValidationController; def rescue_action(e) raise e end; end
 
-class EnterpriseValidationControllerTest < Test::Unit::TestCase
+class EnterpriseValidationControllerTest < ActionController::TestCase
 
   all_fixtures
 
diff --git a/test/functional/environment_design_controller_test.rb b/test/functional/environment_design_controller_test.rb
index bf0e83a..8a0a7b0 100644
--- a/test/functional/environment_design_controller_test.rb
+++ b/test/functional/environment_design_controller_test.rb
@@ -4,7 +4,7 @@ require 'environment_design_controller'
 # Re-raise errors caught by the controller.
 class EnvironmentDesignController; def rescue_action(e) raise e end; end
 
-class EnvironmentDesignControllerTest < Test::Unit::TestCase
+class EnvironmentDesignControllerTest < ActionController::TestCase
 
   ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
 
diff --git a/test/functional/environment_role_manager_controller_test.rb b/test/functional/environment_role_manager_controller_test.rb
index 3305178..9f22720 100644
--- a/test/functional/environment_role_manager_controller_test.rb
+++ b/test/functional/environment_role_manager_controller_test.rb
@@ -4,7 +4,7 @@ require 'environment_role_manager_controller'
 # Re-raise errors caught by the controller.
 class EnvironmentRoleManagerController; def rescue_action(e) raise e end; end
 
-class EnvironmentRoleManagerControllerTest < Test::Unit::TestCase
+class EnvironmentRoleManagerControllerTest < ActionController::TestCase
   def setup
     @controller = EnvironmentRoleManagerController.new
     @request    = ActionController::TestRequest.new
diff --git a/test/functional/favorite_enterprises_controller_test.rb b/test/functional/favorite_enterprises_controller_test.rb
index 2622e29..a0246cf 100644
--- a/test/functional/favorite_enterprises_controller_test.rb
+++ b/test/functional/favorite_enterprises_controller_test.rb
@@ -3,7 +3,7 @@ require 'favorite_enterprises_controller'
 
 class FavoriteEnterprisesController; def rescue_action(e) raise e end; end
 
-class FavoriteEnterprisesControllerTest < Test::Unit::TestCase
+class FavoriteEnterprisesControllerTest < ActionController::TestCase
 
   noosfero_test :profile => 'testuser'
 
diff --git a/test/functional/features_controller_test.rb b/test/functional/features_controller_test.rb
index 3d9c592..ad7bb8f 100644
--- a/test/functional/features_controller_test.rb
+++ b/test/functional/features_controller_test.rb
@@ -4,7 +4,7 @@ require 'features_controller'
 # Re-raise errors caught by the controller.
 class FeaturesController; def rescue_action(e) raise e end; end
 
-class FeaturesControllerTest < Test::Unit::TestCase
+class FeaturesControllerTest < ActionController::TestCase
 
   all_fixtures 
   def setup
diff --git a/test/functional/friends_controller_test.rb b/test/functional/friends_controller_test.rb
index 172b450..3b37aaa 100644
--- a/test/functional/friends_controller_test.rb
+++ b/test/functional/friends_controller_test.rb
@@ -3,7 +3,7 @@ require 'friends_controller'
 
 class FriendsController; def rescue_action(e) raise e end; end
 
-class FriendsControllerTest < Test::Unit::TestCase
+class FriendsControllerTest < ActionController::TestCase
 
   noosfero_test :profile => 'testuser'
 
diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
index 4cd6b47..d445bf2 100644
--- a/test/functional/home_controller_test.rb
+++ b/test/functional/home_controller_test.rb
@@ -4,7 +4,7 @@ require 'home_controller'
 # Re-raise errors caught by the controller.
 class HomeController; def rescue_action(e) raise e end; end
 
-class HomeControllerTest < Test::Unit::TestCase
+class HomeControllerTest < ActionController::TestCase
 
 #  all_fixtures:profiles, :environments, :domains
 all_fixtures
diff --git a/test/functional/mailconf_controller_test.rb b/test/functional/mailconf_controller_test.rb
index 0e4d26c..a82466b 100644
--- a/test/functional/mailconf_controller_test.rb
+++ b/test/functional/mailconf_controller_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class MailconfControllerTest < Test::Unit::TestCase
+class MailconfControllerTest < ActionController::TestCase
 
   all_fixtures
 
diff --git a/test/functional/manage_products_controller_test.rb b/test/functional/manage_products_controller_test.rb
index 5ce301b..54cc335 100644
--- a/test/functional/manage_products_controller_test.rb
+++ b/test/functional/manage_products_controller_test.rb
@@ -4,7 +4,7 @@ require 'manage_products_controller'
 # Re-raise errors caught by the controller.
 class ManageProductsController; def rescue_action(e) raise e end; end
 
-class ManageProductsControllerTest < Test::Unit::TestCase
+class ManageProductsControllerTest < ActionController::TestCase
   all_fixtures
   def setup
     @controller = ManageProductsController.new
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index ba771cd..437abc2 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -4,7 +4,7 @@ require 'maps_controller'
 # Re-raise errors caught by the controller.
 class MapsController; def rescue_action(e) raise e end; end
 
-class MapsControllerTest < Test::Unit::TestCase
+class MapsControllerTest < ActionController::TestCase
 
   def setup
     @controller = MapsController.new
diff --git a/test/functional/memberships_controller_test.rb b/test/functional/memberships_controller_test.rb
index e9c4439..808b57f 100644
--- a/test/functional/memberships_controller_test.rb
+++ b/test/functional/memberships_controller_test.rb
@@ -5,7 +5,7 @@ require 'memberships_controller'
 # Re-raise errors caught by the controller.
 class MembershipsController; def rescue_action(e) raise e end; end
 
-class MembershipsControllerTest < Test::Unit::TestCase
+class MembershipsControllerTest < ActionController::TestCase
   
   include ApplicationHelper
 
diff --git a/test/functional/my_profile_controller_test.rb b/test/functional/my_profile_controller_test.rb
index 309db59..e68ae70 100644
--- a/test/functional/my_profile_controller_test.rb
+++ b/test/functional/my_profile_controller_test.rb
@@ -11,7 +11,7 @@ class OnlyForPersonTestController < MyProfileController
   end
 end
 
-class MyProfileControllerTest < Test::Unit::TestCase
+class MyProfileControllerTest < ActionController::TestCase
 
   all_fixtures
   def setup
diff --git a/test/functional/plugins_controller_test.rb b/test/functional/plugins_controller_test.rb
index 1e1576b..46b0889 100644
--- a/test/functional/plugins_controller_test.rb
+++ b/test/functional/plugins_controller_test.rb
@@ -4,7 +4,7 @@ require 'plugins_controller'
 # Re-raise errors caught by the controller.
 class PluginsController; def rescue_action(e) raise e end; end
 
-class PluginsControllerTest < Test::Unit::TestCase
+class PluginsControllerTest < ActionController::TestCase
 
   all_fixtures
   def setup
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index 13ba103..403f275 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -4,7 +4,7 @@ require 'profile_controller'
 # Re-raise errors caught by the controller.
 class ProfileController; def rescue_action(e) raise e end; end
 
-class ProfileControllerTest < Test::Unit::TestCase
+class ProfileControllerTest < ActionController::TestCase
   def setup
     @controller = ProfileController.new
     @request    = ActionController::TestRequest.new
diff --git a/test/functional/profile_design_controller_test.rb b/test/functional/profile_design_controller_test.rb
index 9fae6d6..affc222 100644
--- a/test/functional/profile_design_controller_test.rb
+++ b/test/functional/profile_design_controller_test.rb
@@ -3,7 +3,7 @@ require 'profile_design_controller'
 
 class ProfileDesignController; def rescue_action(e) raise e end; end
 
-class ProfileDesignControllerTest < Test::Unit::TestCase
+class ProfileDesignControllerTest < ActionController::TestCase
   
   COMMOM_BLOCKS = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock ]
   PERSON_BLOCKS = COMMOM_BLOCKS + [FriendsBlock, FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
diff --git a/test/functional/profile_editor_controller_test.rb b/test/functional/profile_editor_controller_test.rb
index e329d12..ca7a409 100644
--- a/test/functional/profile_editor_controller_test.rb
+++ b/test/functional/profile_editor_controller_test.rb
@@ -4,7 +4,7 @@ require 'profile_editor_controller'
 # Re-raise errors caught by the controller.
 class ProfileEditorController; def rescue_action(e) raise e end; end
 
-class ProfileEditorControllerTest < Test::Unit::TestCase
+class ProfileEditorControllerTest < ActionController::TestCase
   all_fixtures
   
   def setup
diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb
index d8a164f..c6ade4c 100644
--- a/test/functional/profile_members_controller_test.rb
+++ b/test/functional/profile_members_controller_test.rb
@@ -4,7 +4,7 @@ require 'profile_members_controller'
 # Re-raise errors caught by the controller.
 class ProfileMembersController; def rescue_action(e) raise e end; end
 
-class ProfileMembersControllerTest < Test::Unit::TestCase
+class ProfileMembersControllerTest < ActionController::TestCase
   def setup
     @controller = ProfileMembersController.new
     @request    = ActionController::TestRequest.new
diff --git a/test/functional/profile_search_controller_test.rb b/test/functional/profile_search_controller_test.rb
index 0feb6f9..735ffd7 100644
--- a/test/functional/profile_search_controller_test.rb
+++ b/test/functional/profile_search_controller_test.rb
@@ -4,7 +4,7 @@ require 'profile_search_controller'
 # Re-raise errors caught by the controller.
 class ProfileSearchController; def rescue_action(e) raise e end; end
 
-class ProfileSearchControllerTest < Test::Unit::TestCase
+class ProfileSearchControllerTest < ActionController::TestCase
   def setup
     @controller = ProfileSearchController.new
     @request    = ActionController::TestRequest.new
diff --git a/test/functional/public_controller_test.rb b/test/functional/public_controller_test.rb
index 9f53172..1ddc726 100644
--- a/test/functional/public_controller_test.rb
+++ b/test/functional/public_controller_test.rb
@@ -4,7 +4,7 @@ require 'public_controller'
 # Re-raise errors caught by the controller.
 class PublicController; def rescue_action(e) raise e end; end
 
-class PublicControllerTest < Test::Unit::TestCase
+class PublicControllerTest < ActionController::TestCase
 
   should 'inherit from ApplicationController' do
     assert_kind_of ApplicationController, PublicController.new
diff --git a/test/functional/region_validators_controller_test.rb b/test/functional/region_validators_controller_test.rb
index 66e0db5..2447fe2 100644
--- a/test/functional/region_validators_controller_test.rb
+++ b/test/functional/region_validators_controller_test.rb
@@ -4,7 +4,7 @@ require 'region_validators_controller'
 # Re-raise errors caught by the controller.
 class RegionValidatorsController; def rescue_action(e) raise e end; end
 
-class RegionValidatorsControllerTest < Test::Unit::TestCase
+class RegionValidatorsControllerTest < ActionController::TestCase
   all_fixtures
   def setup
     @controller = RegionValidatorsController.new
diff --git a/test/functional/role_controller_test.rb b/test/functional/role_controller_test.rb
index 2452b10..59157e0 100644
--- a/test/functional/role_controller_test.rb
+++ b/test/functional/role_controller_test.rb
@@ -4,7 +4,7 @@ require 'role_controller'
 # Re-raise errors caught by the controller.
 class RoleController; def rescue_action(e) raise e end; end
 
-class RoleControllerTest < Test::Unit::TestCase
+class RoleControllerTest < ActionController::TestCase
   all_fixtures
 
   def setup
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 1f31bcf..c8c77cb 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -4,7 +4,7 @@ require 'search_controller'
 # Re-raise errors caught by the controller.
 class SearchController; def rescue_action(e) raise e end; end
 
-class SearchControllerTest < Test::Unit::TestCase
+class SearchControllerTest < ActionController::TestCase
   def setup
     @controller = SearchController.new
     @request    = ActionController::TestRequest.new
diff --git a/test/functional/system_controller_test.rb b/test/functional/system_controller_test.rb
index d70d96a..5a81411 100644
--- a/test/functional/system_controller_test.rb
+++ b/test/functional/system_controller_test.rb
@@ -4,7 +4,7 @@ require 'system_controller'
 # Re-raise errors caught by the controller.
 class SystemController; def rescue_action(e) raise e end; end
 
-class SystemControllerTest < Test::Unit::TestCase
+class SystemControllerTest < ActionController::TestCase
   def setup
     @controller = SystemController.new
     @request    = ActionController::TestRequest.new
diff --git a/test/functional/tasks_controller_test.rb b/test/functional/tasks_controller_test.rb
index 290ca0e..8ee4c44 100644
--- a/test/functional/tasks_controller_test.rb
+++ b/test/functional/tasks_controller_test.rb
@@ -3,7 +3,7 @@ require 'tasks_controller'
 
 class TasksController; def rescue_action(e) raise e end; end
 
-class TasksControllerTest < Test::Unit::TestCase
+class TasksControllerTest < ActionController::TestCase
 
   noosfero_test :profile => 'testuser' 
 
diff --git a/test/functional/themes_controller_test.rb b/test/functional/themes_controller_test.rb
index f951cf7..19238d0 100644
--- a/test/functional/themes_controller_test.rb
+++ b/test/functional/themes_controller_test.rb
@@ -3,7 +3,7 @@ require 'themes_controller'
 
 class ThemesController; def rescue_action(e) raise e end; end
 
-class ThemesControllerTest < Test::Unit::TestCase
+class ThemesControllerTest < ActionController::TestCase
 
   def setup
     @controller = ThemesController.new
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index d58e501..92268ab 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -4,7 +4,7 @@ require 'users_controller'
 # Re-raise errors caught by the controller.
 class UsersController; def rescue_action(e) raise e end; end
 
-class UsersControllerTest < Test::Unit::TestCase
+class UsersControllerTest < ActionController::TestCase
 
   all_fixtures
   def setup
--
libgit2 0.21.2