diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 23377fc..9822060 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -7,8 +7,8 @@ class ApplicationControllerTest < ActionController::TestCase
 
   def setup
     @environment = Environment.default
-    create_merit_categorization
     @environment.enable_plugin(GamificationPlugin)
+    create_point_rule_definition('article_author')
     @controller = TestController.new
     @controller.stubs(:environment).returns(@environment)
   end
diff --git a/test/functional/gamification_plugin_admin_controller_test.rb b/test/functional/gamification_plugin_admin_controller_test.rb
index 8cee790..7e9d25e 100644
--- a/test/functional/gamification_plugin_admin_controller_test.rb
+++ b/test/functional/gamification_plugin_admin_controller_test.rb
@@ -4,34 +4,12 @@ class GamificationPluginAdminControllerTest < ActionController::TestCase
 
   def setup
     @environment = Environment.default
-    create_merit_categorization
     @person = create_user_with_permission('profile', 'edit_environment_features', Environment.default)
     login_as(@person.identifier)
   end
 
   attr_accessor :person, :environment
 
-  should 'save point rules' do
-    post :points, :settings => {:point_rules => {'comment_author' => {'weight' => '10'}}}
-    @settings = Noosfero::Plugin::Settings.new(environment.reload, GamificationPlugin)
-    assert_equal({:point_rules => {'comment_author' => {'weight' => '10'}}}, @settings.settings)
-  end
-
-  should 'load default weights for point rules' do
-    get :points
-    Merit::PointRules::AVAILABLE_RULES.each do |category, setting|
-      assert_select 'input[name=?][value=?]', "settings[point_rules][#{category}[weight]]", setting[:default_weight]
-    end
-  end
-
-  should 'load saved weights for point rules' do
-    settings = Noosfero::Plugin::Settings.new(environment, GamificationPlugin, {})
-    settings.set_setting(:point_rules, {'comment_author' => {'weight' => '500'}})
-    settings.save!
-    get :points
-    assert_select 'input[name=?][value=?]', "settings[point_rules][comment_author[weight]]", 500
-  end
-
   should 'save rank rules' do
     post :levels, :settings => {:rank_rules => [{:level => 1, :points => 10}]}
     @settings = Noosfero::Plugin::Settings.new(environment.reload, GamificationPlugin)
diff --git a/test/functional/gamification_plugin_points_controller_test.rb b/test/functional/gamification_plugin_points_controller_test.rb
new file mode 100644
index 0000000..c4cd85f
--- /dev/null
+++ b/test/functional/gamification_plugin_points_controller_test.rb
@@ -0,0 +1,70 @@
+require 'test_helper'
+
+class GamificationPluginPointsControllerTest < ActionController::TestCase
+
+  setup do
+    @environment = Environment.default
+    login_as(create_admin_user(@environment))
+  end
+
+  should "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:categories)
+  end
+
+  should "should create gamification_plugin_point_categorizations for existing community" do
+    community = fast_create(Community)
+    create_all_point_rules
+    count = GamificationPlugin::PointsType.count
+    assert_difference('GamificationPlugin::PointsCategorization.for_profile(community.identifier).count', count) do
+      post :create, identifier: community.identifier
+    end
+  end
+
+  should "should create gamification_plugin_point_categorizations for general rules" do
+    create_all_point_rules
+    count = GamificationPlugin::PointsType.count
+    assert_difference('GamificationPlugin::PointsCategorization.count', count) do
+      post :create, identifier: ''
+    end
+  end
+
+  should "should not create gamification_plugin_point_categorizations for not existing community" do
+    create_all_point_rules
+    assert_no_difference('GamificationPlugin::PointsCategorization.count') do
+      post :create, identifier: 'any_not_existent_community_name'
+    end
+  end
+
+  should "should get edit" do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    get :edit, id: community.id
+    assert_not_nil assigns(:profile)
+    assert_not_nil assigns(:categories)
+  end
+
+  should "should update gamification_plugin_points" do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    weights = {}
+    GamificationPlugin::PointsCategorization.for_profile(community.identifier).each do |c|
+      weights[c.id] = {weight: c.weight+10}
+    end
+    put :edit, id: community.id, gamification_plugin_points_categorizations: weights
+    weights.each do |id, w|
+      c = GamificationPlugin::PointsCategorization.find id
+      assert_equal c.weight, w[:weight]
+    end
+  end
+
+  should "should destroy gamification_plugin_point" do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author',  community)
+    count = GamificationPlugin::PointsCategorization.for_profile(community.identifier).count
+    assert_difference('GamificationPlugin::PointsCategorization.count',-count) do
+      delete :destroy, id: community.id
+    end
+  end
+end
--
libgit2 0.21.2