diff --git a/test/unit/scrap_test.rb b/test/unit/scrap_test.rb
index ecbb4b4..4f0fe42 100644
--- a/test/unit/scrap_test.rb
+++ b/test/unit/scrap_test.rb
@@ -215,7 +215,7 @@ class ScrapTest < ActiveSupport::TestCase
     s = fast_create(Scrap, :updated_at => DateTime.parse('2010-01-01'))
     assert_equal DateTime.parse('2010-01-01'), s.updated_at.strftime('%Y-%m-%d')
     DateTime.stubs(:now).returns(DateTime.parse('2010-09-07'))
-    s1 = Scrap.create(defaults_for_scrap(:scrap_id => s.id))
+    s1 = create(Scrap, defaults_for_scrap(:scrap_id => s.id))
     s.reload
     assert_not_equal DateTime.parse('2010-01-01'), s.updated_at.strftime('%Y-%m-%d')
   end
@@ -230,20 +230,20 @@ class ScrapTest < ActiveSupport::TestCase
 
   should 'strip all html tags' do
     s, r = fast_create(Person), fast_create(Person)
-    s = Scrap.new :sender => s, :receiver => r, :content => "<p>Test <b>Rails</b></p>"
+    s = build Scrap, :sender => s, :receiver => r, :content => "<p>Test <b>Rails</b></p>"
     assert_equal "Test Rails", s.strip_all_html_tags
   end
 
   should 'strip html before save' do
     s, r = fast_create(Person), fast_create(Person)
-    s = Scrap.new :sender => s, :receiver => r, :content => "<p>Test <b>Rails</b></p>"
+    s = build Scrap, :sender => s, :receiver => r, :content => "<p>Test <b>Rails</b></p>"
     s.save!
     assert_equal "Test Rails", s.reload.content
   end
 
   should 'strip html before validate' do
     s, r = fast_create(Person), fast_create(Person)
-    s = Scrap.new :sender => s, :receiver => r, :content => "<p><b></b></p>"
+    s = build Scrap, :sender => s, :receiver => r, :content => "<p><b></b></p>"
     assert !s.valid?
     s.content = "<p>Test</p>"
     assert s.valid?
@@ -260,15 +260,15 @@ class ScrapTest < ActiveSupport::TestCase
 
   should 'scrap wall url be the root scrap receiver url if it is a reply' do
     p1, p2 = fast_create(Person), fast_create(Person)
-    r = Scrap.create! :sender => p1, :receiver => p2, :content => "Hello!"
-    s = Scrap.new :sender => p2, :receiver => p1, :content => "Hi!"
+    r = create Scrap, :sender => p1, :receiver => p2, :content => "Hello!"
+    s = build Scrap, :sender => p2, :receiver => p1, :content => "Hi!"
     r.replies << s; s.reload
     assert_equal s.scrap_wall_url, s.root.receiver.wall_url
   end
 
   should 'scrap wall url be the scrap receiver url if it is not a reply' do
     p1, p2 = fast_create(Person), fast_create(Person)
-    s = Scrap.create! :sender => p1, :receiver => p2, :content => "Hello!"
+    s = create Scrap, :sender => p1, :receiver => p2, :content => "Hello!"
     assert_equal s.scrap_wall_url, s.receiver.wall_url
   end
 
diff --git a/test/unit/tiny_mce_article_test.rb b/test/unit/tiny_mce_article_test.rb
index e7433a9..72847ae 100644
--- a/test/unit/tiny_mce_article_test.rb
+++ b/test/unit/tiny_mce_article_test.rb
@@ -142,7 +142,6 @@ class TinyMceArticleTest < ActiveSupport::TestCase
   should 'not update activity on update of an article' do
     ActionTracker::Record.delete_all
     profile = fast_create(Profile)
-    ActionTracker::Record.stubs(:current_user_from_model).returns(fast_create(Person))
     article = create(TinyMceArticle, :profile_id => profile.id)
     time = article.activity.updated_at
     Time.stubs(:now).returns(time + 1.day)
@@ -186,7 +185,6 @@ end
   should "the tracker action target be defined as the article on articles'creation in profile" do
     ActionTracker::Record.delete_all
     person = Person.first
-    ActionTracker::Record.stubs(:current_user_from_model).returns(fast_create(Person))
     article = create TinyMceArticle, :name => 'test', :profile_id => person.id
     assert_equal article, ActionTracker::Record.last.target
   end
--
libgit2 0.21.2