diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index f103282..2670dc8 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -60,7 +60,7 @@ class CommentTest < ActiveSupport::TestCase
     c1.name = 'my name'
     c1.valid?
     assert c1.errors[:name.to_s].present?
-    assert_no_match /\{fn\}/, c1.errors.on(:name)
+    assert_no_match /\{fn\}/, c1.errors[:name].first
   end
 
   should 'update counter cache in article' do
@@ -86,7 +86,7 @@ class CommentTest < ActiveSupport::TestCase
     person = fast_create(Person)
     community = fast_create(Community)
 
-    activity = ActionTracker::Record.create :user => person, :target => community, :verb => 'add_member_in_community'
+    activity = create ActionTracker::Record, :user => person, :target => community, :verb => 'add_member_in_community'
 
     cc = activity.comments_count
 
@@ -96,40 +96,40 @@ class CommentTest < ActiveSupport::TestCase
 
   should 'provide author name for authenticated authors' do
     owner = create_user('testuser').person
-    assert_equal 'testuser', Comment.new(:author => owner).author_name
+    assert_equal 'testuser', build(Comment, :author => owner).author_name
   end
 
   should 'provide author name for unauthenticated author' do
-    assert_equal 'anonymous coward', Comment.new(:name => 'anonymous coward').author_name
+    assert_equal 'anonymous coward', build(Comment, :name => 'anonymous coward').author_name
   end
 
   should 'provide empty text for author name if user was removed ' do
-    assert_equal '', Comment.new(:author_id => 9999).author_name
+    assert_equal '', build(Comment, :author_id => 9999).author_name
   end
 
   should "provide author e-mail for athenticated authors" do
     owner = create_user('testuser').person
-    assert_equal owner.email, Comment.new(:author => owner).author_email
+    assert_equal owner.email, build(Comment, :author => owner).author_email
   end
 
   should "provide author e-mail for unauthenticated author" do
-    assert_equal 'my@email.com', Comment.new(:email => 'my@email.com').author_email
+    assert_equal 'my@email.com', build(Comment, :email => 'my@email.com').author_email
   end
 
   should 'provide author link for authenticated author' do
     author = Person.new
     author.expects(:url).returns('http://blabla.net/author')
-    assert_equal  'http://blabla.net/author', Comment.new(:author => author).author_link
+    assert_equal  'http://blabla.net/author', build(Comment, :author => author).author_link
   end
 
   should 'provide author e-mail as author link for unauthenticated author' do
-    assert_equal 'my@email.com', Comment.new(:email => 'my@email.com').author_link
+    assert_equal 'my@email.com', build(Comment, :email => 'my@email.com').author_link
   end
 
   should 'provide url to comment' do
     art = Article.new
     art.expects(:url).returns({ :controller => 'lala', :action => 'something' })
-    comment = Comment.new(:article => art)
+    comment = build(Comment, :article => art)
     comment.expects(:id).returns(9876)
 
     assert_equal({ :controller => 'lala', :action => 'something', :anchor => 'comment-9876'}, comment.url)
@@ -148,7 +148,7 @@ class CommentTest < ActiveSupport::TestCase
     art = owner.articles.build(:name => 'ytest'); art.save!
     comments = []
     3.times do
-      comments.unshift art.comments.create!(:title => 'a test comment', :body => 'bla', :author => owner)
+      comments.unshift create(Comment, :article => art, :title => 'a test comment', :body => 'bla', :author => owner)
     end
 
     assert_equal comments, Comment.recent
@@ -161,7 +161,7 @@ class CommentTest < ActiveSupport::TestCase
     art = owner.articles.build(:name => 'ytest'); art.save!
     comments = []
     3.times do
-      comments.unshift art.comments.create!(:title => 'a test comment', :body => 'bla', :author => owner)
+      comments.unshift create(Comment, :article => art, :title => 'a test comment', :body => 'bla', :author => owner)
     end
 
     comments.pop
@@ -170,15 +170,15 @@ class CommentTest < ActiveSupport::TestCase
   end
 
   should 'not accept invalid email' do
-    c = Comment.new(:name => 'My Name', :email => 'my@invalid')
+    c = build(Comment, :name => 'My Name', :email => 'my@invalid')
     c.valid?
     assert c.errors[:email.to_s].present?
   end
 
   should 'generate links to comments on images with view set to true' do
     owner = create_user('testuser').person
-    image = UploadedFile.create!(:profile => owner, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    comment = image.comments.create!(:article => image, :author => owner, :title => 'a random comment', :body => 'just another comment')
+    image = create(UploadedFile, :profile => owner, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    comment = create(Comment, :article => image, :author => owner, :title => 'a random comment', :body => 'just another comment')
 
     assert comment.url[:view]
   end
@@ -187,14 +187,14 @@ class CommentTest < ActiveSupport::TestCase
     owner = create_user('testuser').person
     article = owner.articles.create!(:name => 'test', :body => '...')
     javascript = "<script>alert('XSS')</script>"
-    comment = article.comments.create!(:article => article, :name => javascript, :title => javascript, :body => javascript, :email => 'cracker@test.org')
+    comment = create(Comment, :article => article, :name => javascript, :title => javascript, :body => javascript, :email => 'cracker@test.org')
     assert_no_match(/<script>/, comment.name)
   end
 
   should 'sanitize required fields before validation' do
     owner = create_user('testuser').person
     article = owner.articles.create(:name => 'test', :body => '...')
-    comment = article.comments.new(:title => '<h1 title </h1>', :body => '<h1 body </h1>', :name => '<h1 name </h1>', :email => 'cracker@test.org')
+    comment = build(Comment, :article => article, :title => '<h1 title </h1>', :body => '<h1 body </h1>', :name => '<h1 name </h1>', :email => 'cracker@test.org')
     comment.valid?
 
     assert comment.errors[:name.to_s].present?
@@ -204,7 +204,7 @@ class CommentTest < ActiveSupport::TestCase
   should 'escape malformed html tags' do
     owner = create_user('testuser').person
     article = owner.articles.create(:name => 'test', :body => '...')
-    comment = article.comments.new(:title => '<h1 title </h1>>> sd f <<', :body => '<h1>> sdf><asd>< body </h1>', :name => '<h1 name </h1>>><<dfsf<sd', :email => 'cracker@test.org')
+    comment = build(Comment, :article => article, :title => '<h1 title </h1>>> sd f <<', :body => '<h1>> sdf><asd>< body </h1>', :name => '<h1 name </h1>>><<dfsf<sd', :email => 'cracker@test.org')
     comment.valid?
 
     assert_no_match /[<>]/, comment.title
@@ -213,7 +213,7 @@ class CommentTest < ActiveSupport::TestCase
   end
 
   should 'use an existing image for deleted comments' do
-    image = Comment.new.removed_user_image
+    image = Comment.new.removed_user_image[1..-1]
     assert File.exists?(Rails.root.join('public', image)), "#{image} does not exist."
   end
 
@@ -245,10 +245,10 @@ class CommentTest < ActiveSupport::TestCase
     Comment.delete_all
     owner = create_user('testuser').person
     article = owner.articles.create!(:name => 'test', :body => '...')
-    c = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
-    c1 = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org', :reply_of_id => c.id)
-    c2 = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
-    c3 = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org', :reply_of_id => c.id)
+    c =  create(Comment, :article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
+    c1 = create(Comment, :article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org', :reply_of_id => c.id)
+    c2 = create(Comment, :article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
+    c3 = create(Comment, :article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org', :reply_of_id => c.id)
     assert_equal 4, Comment.count
     c.destroy
     assert_equal [c2], Comment.all
@@ -287,12 +287,12 @@ class CommentTest < ActiveSupport::TestCase
 
   should "return activities comments as a thread" do
     person = fast_create(Person)
-    a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
-    c0 = Comment.create!(:source => a, :body => 'My comment', :author => person)
-    c1 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
-    c2 = Comment.create!(:reply_of_id => c1.id, :source => a, :body => 'bla', :author => person)
-    c3 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
-    c4 = Comment.create!(:source => a, :body => 'My comment', :author => person)
+    a = create(TextileArticle, :profile => person, :name => 'My article', :body => 'Article body')
+    c0 = create(Comment, :source => a, :body => 'My comment', :author => person)
+    c1 = create(Comment, :reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
+    c2 = create(Comment, :reply_of_id => c1.id, :source => a, :body => 'bla', :author => person)
+    c3 = create(Comment, :reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
+    c4 = create(Comment, :source => a, :body => 'My comment', :author => person)
     result = a.activity.comments_as_thread
     assert_equal c0, result[0]
     assert_equal [c1, c3], result[0].replies
@@ -304,11 +304,11 @@ class CommentTest < ActiveSupport::TestCase
   should 'provide author url for authenticated user' do
     author = Person.new
     author.expects(:url).returns('http://blabla.net/author')
-    assert_equal  'http://blabla.net/author', Comment.new(:author => author).author_url
+    assert_equal  'http://blabla.net/author', build(Comment, :author => author).author_url
   end
 
   should 'not provide author url for unauthenticated user' do
-    assert_nil Comment.new(:email => 'my@email.com').author_url
+    assert_nil build(Comment, :email => 'my@email.com').author_url
   end
 
   should 'be able to reject a comment' do
@@ -324,28 +324,28 @@ class CommentTest < ActiveSupport::TestCase
     person = create_user('follower').person
     article = fast_create(Article, :profile_id => owner.id)
     assert_not_includes article.followers, person.email
-    article.comments.create!(:source => article, :author => person, :title => 'new comment', :body => 'new comment')
+    create(Comment, :source => article, :author => person, :title => 'new comment', :body => 'new comment')
     assert_includes article.reload.followers, person.email
   end
 
   should 'subscribe guest user as follower of an article on new comment' do
     article = fast_create(Article, :profile_id => create_user('article_owner').person.id)
     assert_not_includes article.followers, 'follower@example.com'
-    article.comments.create!(:source => article, :name => 'follower', :email => 'follower@example.com', :title => 'new comment', :body => 'new comment')
+    create(Comment, :source => article, :name => 'follower', :email => 'follower@example.com', :title => 'new comment', :body => 'new comment')
     assert_includes article.reload.followers, 'follower@example.com'
   end
 
   should 'keep unique emails in list of followers' do
     article = fast_create(Article, :profile_id => create_user('article_owner').person.id)
-    article.comments.create!(:source => article, :name => 'follower one', :email => 'follower@example.com', :title => 'new comment', :body => 'new comment')
-    article.comments.create!(:source => article, :name => 'follower two', :email => 'follower@example.com', :title => 'another comment', :body => 'new comment')
+    create(Comment, :source => article, :name => 'follower one', :email => 'follower@example.com', :title => 'new comment', :body => 'new comment')
+    create(Comment, :source => article, :name => 'follower two', :email => 'follower@example.com', :title => 'another comment', :body => 'new comment')
     assert_equal 1, article.reload.followers.select{|v| v == 'follower@example.com'}.count
   end
 
   should 'not subscribe owner as follower of an article on new comment' do
     owner = create_user('owner_of_article').person
     article = fast_create(Article, :profile_id => owner.id)
-    article.comments.create!(:source => article, :author => owner, :title => 'new comment', :body => 'new comment')
+    create(Comment, :source => article, :author => owner, :title => 'new comment', :body => 'new comment')
     assert_not_includes article.reload.followers, owner.email
   end
 
@@ -355,8 +355,8 @@ class CommentTest < ActiveSupport::TestCase
     admin = create_user('admin_of_community').person
     owner.add_admin(admin)
     article = fast_create(Article, :profile_id => owner.id)
-    article.comments.create!(:source => article, :author => follower, :title => 'new comment', :body => 'new comment')
-    article.comments.create!(:source => article, :author => admin, :title => 'new comment', :body => 'new comment')
+    create(Comment, :source => article, :author => follower, :title => 'new comment', :body => 'new comment')
+    create(Comment, :source => article, :author => admin, :title => 'new comment', :body => 'new comment')
     assert_not_includes article.reload.followers, admin.email
     assert_includes article.followers, follower.email
   end
@@ -501,12 +501,12 @@ class CommentTest < ActiveSupport::TestCase
   end
 
   should 'store User-Agent' do
-    c = Comment.new(:user_agent => 'foo')
+    c = build(Comment, :user_agent => 'foo')
     assert_equal 'foo', c.user_agent
   end
 
   should 'store referrer' do
-    c = Comment.new(:referrer => 'bar')
+    c = build(Comment, :referrer => 'bar')
     assert_equal 'bar', c.referrer
   end
 
@@ -528,7 +528,7 @@ class CommentTest < ActiveSupport::TestCase
 
   should 'not need moderation if article is not moderated' do
     article = Article.new
-    comment = Comment.new(:article => article)
+    comment = build(Comment, :article => article)
 
     assert !comment.need_moderation?
   end
@@ -540,7 +540,7 @@ class CommentTest < ActiveSupport::TestCase
     article.stubs(:author).returns(author)
     article.moderate_comments = true
 
-    comment = Comment.new(:article => article)
+    comment = build(Comment, :article => article)
     comment.stubs(:author).returns(author)
 
     assert !comment.need_moderation?
@@ -550,7 +550,7 @@ class CommentTest < ActiveSupport::TestCase
     article = Article.new
     article.stubs(:moderate_comments?).returns(true)
 
-    comment = Comment.new(:article => article)
+    comment = build(Comment, :article => article)
 
     assert comment.need_moderation?
   end
@@ -563,7 +563,7 @@ class CommentTest < ActiveSupport::TestCase
     article.stubs(:author).returns(article_author)
     article.stubs(:moderate_comments?).returns(true)
 
-    comment = Comment.new(:article => article)
+    comment = build(Comment, :article => article)
     comment.stubs(:author).returns(comment_author)
 
     assert comment.need_moderation?
@@ -578,8 +578,8 @@ class CommentTest < ActiveSupport::TestCase
   should 'not be able to destroy comment' do
     user = Person.new
     profile = Profile.new
-    article = Article.new(:profile => profile)
-    comment = Comment.new(:article => article)
+    article = build(Article, :profile => profile)
+    comment = build(Comment, :article => article)
     user.expects(:has_permission?).with(:moderate_comments, profile).returns(false)
 
     assert !comment.can_be_destroyed_by?(user)
@@ -587,15 +587,15 @@ class CommentTest < ActiveSupport::TestCase
 
   should 'be able to destroy comment if is the author' do
     user = Person.new
-    comment = Comment.new(:author => user)
+    comment = build(Comment, :author => user)
 
     assert comment.can_be_destroyed_by?(user)
   end
 
   should 'be able to destroy comment if is the profile' do
     user = Person.new
-    article = Article.new(:profile => user)
-    comment = Comment.new(:article => article)
+    article = build(Article, :profile => user)
+    comment = build(Comment, :article => article)
 
     assert comment.can_be_destroyed_by?(user)
   end
@@ -603,8 +603,8 @@ class CommentTest < ActiveSupport::TestCase
   should 'be able to destroy comment if can moderate_comments on the profile' do
     user = Person.new
     profile = Profile.new
-    article = Article.new(:profile => profile)
-    comment = Comment.new(:article => article)
+    article = build(Article, :profile => profile)
+    comment = build(Comment, :article => article)
 
     user.expects(:has_permission?).with(:moderate_comments, profile).returns(true)
 
@@ -620,8 +620,8 @@ class CommentTest < ActiveSupport::TestCase
   should 'not be able to mark comment as spam' do
     user = Person.new
     profile = Profile.new
-    article = Article.new(:profile => profile)
-    comment = Comment.new(:article => article)
+    article = build(Article, :profile => profile)
+    comment = build(Comment, :article => article)
     user.expects(:has_permission?).with(:moderate_comments, profile).returns(false)
 
     assert !comment.can_be_marked_as_spam_by?(user)
@@ -629,8 +629,8 @@ class CommentTest < ActiveSupport::TestCase
 
   should 'be able to mark comment as spam if is the profile' do
     user = Person.new
-    article = Article.new(:profile => user)
-    comment = Comment.new(:article => article)
+    article = build(Article, :profile => user)
+    comment = build(Comment, :article => article)
 
     assert comment.can_be_marked_as_spam_by?(user)
   end
@@ -638,8 +638,8 @@ class CommentTest < ActiveSupport::TestCase
   should 'be able to mark comment as spam if can moderate_comments on the profile' do
     user = Person.new
     profile = Profile.new
-    article = Article.new(:profile => profile)
-    comment = Comment.new(:article => article)
+    article = build(Article, :profile => profile)
+    comment = build(Comment, :article => article)
 
     user.expects(:has_permission?).with(:moderate_comments, profile).returns(true)
 
@@ -661,15 +661,15 @@ class CommentTest < ActiveSupport::TestCase
 
   should 'be able to update comment if is the author' do
     user = Person.new
-    comment = Comment.new(:author => user)
+    comment = build(Comment, :author => user)
 
     assert comment.can_be_updated_by?(user)
   end
 
   should 'get comment root' do
     c1 = Comment.new
-    c2 = Comment.new(:reply_of => c1)
-    c3 = Comment.new(:reply_of => c2)
+    c2 = build(Comment, :reply_of => c1)
+    c3 = build(Comment, :reply_of => c2)
 
     assert_equal c1, c3.comment_root
     assert_equal c1, c2.comment_root
--
libgit2 0.21.2