diff --git a/test/unit/profile_helper_test.rb b/test/unit/profile_helper_test.rb
index 6678e39..eb3a1be 100644
--- a/test/unit/profile_helper_test.rb
+++ b/test/unit/profile_helper_test.rb
@@ -17,45 +17,55 @@ class ProfileHelperTest < ActiveSupport::TestCase
     self.stubs(:user).returns(nil)
     profile.expects(:may_display_field_to?).returns(true)
     profile.expects(:field).returns('value')
-    assert_match /Title.*value/, display_field('Title', profile, 'field')
+    expects(:title).with(:field, anything).returns('Title')
+    assert_match /Title.*value/, display_field(:field)
   end
 
   should 'not display field if may not display it and not forced' do
     self.stubs(:user).returns(nil)
     profile.expects(:may_display_field_to?).returns(false)
-    assert_equal '', display_field('Title', profile, 'field')
+    profile.expects(:field).never
+    assert_equal '', display_field(:field)
   end
 
   should 'display field if may not display it but is forced' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).returns(false)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
+    FORCE.merge!({:person => [:field]})
     profile.expects(:field).returns('value')
-    assert_match /Title.*value/, display_field('Title', profile, 'field', true)
+    expects(:title).with(:field, anything).returns('Title')
+    assert_match /Title.*value/, display_field(:field)
   end
 
   should 'display work info if at least one of the fields should be displayed' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).with(:organization, nil).returns(true)
     profile.stubs(:may_display_field_to?).with(:organization_website, nil).returns(false)
+    profile.stubs(:may_display_field_to?).with(:professional_activity, nil).returns(false)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
     profile.expects(:organization).returns('Organization Name')
     profile.expects(:organization_website).never
-    assert_match /Work.*Organization Name/, display_work_info(profile)
+    profile.expects(:professional_activity).never
+    assert_match /Work.*Organization Name/, display_work
   end
 
   should 'not display work info if none of the fields should be displayed' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).returns(false)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
     profile.expects(:organization).never
     profile.expects(:organization_website).never
-    assert_equal '', display_work_info(profile)
+    assert_equal '', display_work
   end
 
   should 'display work info if both fields should be displayed' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).returns(true)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
     profile.expects(:organization).returns('Organization Name')
     profile.expects(:organization_website).returns('')
-    assert_match /Work.*Organization Name/, display_work_info(profile)
+    assert_match /Work.*Organization Name/, display_work
   end
 
 end
--
libgit2 0.21.2