diff --git a/test/functional/invite_controller_test.rb b/test/functional/invite_controller_test.rb
index 2556713..b6a5f60 100644
--- a/test/functional/invite_controller_test.rb
+++ b/test/functional/invite_controller_test.rb
@@ -246,15 +246,15 @@ class InviteControllerTest < ActionController::TestCase
     get :search_friend, :profile => profile.identifier, :q => 'me@'
 
     assert_equal 'text/html', @response.content_type
-    assert_equal [{"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+    assert_equal [{"id" => friend2.id, "name" => friend2.name}].to_json, @response.body
 
     get :search_friend, :profile => profile.identifier, :q => 'cri'
 
-    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+    assert_equal [{"id" => friend1.id, "name" => friend1.name}].to_json, @response.body
 
     get :search_friend, :profile => profile.identifier, :q => 'will'
 
-    assert_equal [{"name" => friend1.name, "id" => friend1.id}, {"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+    assert_equal [{"id" => friend1.id, "name" => friend1.name}, {"id" => friend2.id, "name" => friend2.name}].to_json, @response.body
   end
 
   should 'not include members in search friends profiles' do
@@ -268,7 +268,7 @@ class InviteControllerTest < ActionController::TestCase
 
     get :search_friend, :profile => community.identifier, :q => 'will'
 
-    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+    assert_equal [{"id" => friend1.id, "name" => friend1.name}].to_json, @response.body
   end
 
   should 'search friends profiles by fields provided by plugins' do
@@ -277,9 +277,10 @@ class InviteControllerTest < ActionController::TestCase
         [{:field => 'nickname'}, {:field => 'contact_phone'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
 
     environment = Environment.default
-    environment.enable_plugin(Plugin1)
+    environment.enable_plugin(Plugin1.name)
 
     friend1 = create_user('harry').person
     friend2 = create_user('william').person
@@ -289,21 +290,21 @@ class InviteControllerTest < ActionController::TestCase
     friend2.save
 
     get :search_friend, :profile => profile.identifier, :q => 'prince'
-    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+    assert_equal [{"id" => friend1.id, "name" => friend1.name}].to_json, @response.body
 
     get :search_friend, :profile => profile.identifier, :q => '222'
-    assert_equal [{"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+    assert_equal [{"id" => friend2.id, "name" => friend2.name}].to_json, @response.body
   end
 
   should 'invite registered users through profile id' do
     friend1 = create_user('testuser1').person
     friend2 = create_user('testuser2').person
-    assert_difference Delayed::Job, :count, 1 do
+    assert_difference 'Delayed::Job.count', 1 do
       post :invite_registered_friend, :profile => profile.identifier, :q => "#{friend1.id},#{friend2.id}", :mail_template => "click: <url>"
       assert_redirected_to :controller => 'profile', :action => 'friends'
     end
 
-    assert_difference InviteFriend, :count, 2 do
+    assert_difference 'InviteFriend.count', 2 do
       process_delayed_job_queue
     end
   end
diff --git a/test/unit/invitation_test.rb b/test/unit/invitation_test.rb
index ae12b48..8617fb3 100644
--- a/test/unit/invitation_test.rb
+++ b/test/unit/invitation_test.rb
@@ -78,7 +78,7 @@ class InvitationTest < ActiveSupport::TestCase
 
     invited_friend.add_friend(person)
 
-    assert_no_difference InviteFriend, :count do
+    assert_no_difference 'InviteFriend.count' do
       Invitation.invite( person, [invited_friend.user.email], "", person )
     end
   end
@@ -90,7 +90,7 @@ class InvitationTest < ActiveSupport::TestCase
     invited_friend.add_friend(person)
     community = fast_create(Community)
 
-    assert_difference InviteMember, :count do
+    assert_difference 'InviteMember.count' do
       Invitation.invite( person, [invited_friend.user.email], "", community )
     end
   end
@@ -126,10 +126,10 @@ class InvitationTest < ActiveSupport::TestCase
     friend = create_user('testuser2').person
     community = fast_create(Community)
 
-    assert_difference InviteMember, :count do
+    assert_difference 'InviteMember.count' do
       Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', community)
     end
-    assert_difference InviteFriend, :count do
+    assert_difference 'InviteFriend.count' do
       Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', person)
     end
   end
@@ -139,17 +139,17 @@ class InvitationTest < ActiveSupport::TestCase
     friend = create_user('testuser2').person
     community = fast_create(Community)
 
-    assert_difference InviteMember, :count do
+    assert_difference 'InviteMember.count' do
       Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', community)
     end
-    assert_difference InviteFriend, :count do
+    assert_difference 'InviteFriend.count' do
       Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', person)
     end
 
-    assert_no_difference InviteMember, :count do
+    assert_no_difference 'InviteMember.count' do
       Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', community)
     end
-    assert_no_difference InviteFriend, :count do
+    assert_no_difference 'InviteFriend.count' do
       Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', person)
     end
   end
diff --git a/test/unit/invite_member_test.rb b/test/unit/invite_member_test.rb
index 248c6e9..cccff4e 100644
--- a/test/unit/invite_member_test.rb
+++ b/test/unit/invite_member_test.rb
@@ -31,7 +31,7 @@ class InviteMemberTest < ActiveSupport::TestCase
     task = InviteMember.create!(:person => p1, :friend => friend, :community_id => community.id)
     InviteMember.create!(:person => p2, :friend => friend, :community_id => community.id)
 
-    assert_difference friend.tasks.pending, :count, -2 do
+    assert_difference 'friend.tasks.pending.count', -2 do
       task.finish
     end
   end
@@ -96,7 +96,9 @@ class InviteMemberTest < ActiveSupport::TestCase
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
 
-    TaskMailer.expects(:deliver_target_notification).once
+    mailer = mock
+    mailer.expects(:deliver).at_least_once
+    TaskMailer.expects(:target_notification).returns(mailer).once
 
     task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
   end
@@ -166,7 +168,7 @@ class InviteMemberTest < ActiveSupport::TestCase
 
     task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
 
-    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+    email = TaskMailer.target_notification(task, task.target_notification_message).deliver
     assert_match(/#{task.requestor.name} invited you to join #{task.community.name}/, email.subject)
   end
 end
--
libgit2 0.21.2