diff --git a/app/models/comment.rb b/app/models/comment.rb
index 8e85a8f..7c1062e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -84,12 +84,6 @@ class Comment < ActiveRecord::Base
     self.article.profile.notification_emails - [self.author_email || self.email]
   end
 
-  after_save :notify_article
-  after_destroy :notify_article
-  def notify_article
-    article.comments_updated if article.kind_of?(Article)
-  end
-
   after_create :new_follower
   def new_follower
     if source.kind_of?(Article)
diff --git a/plugins/solr/test/unit/article_test.rb b/plugins/solr/test/unit/article_test.rb
index a749977..2cc3de5 100644
--- a/plugins/solr/test/unit/article_test.rb
+++ b/plugins/solr/test/unit/article_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class ArticleTest < ActiveSupport::TestCase
   def setup
@@ -83,7 +84,7 @@ class ArticleTest < ActiveSupport::TestCase
     TestSolr.enable
     owner = create_user('testuser').person
     art = fast_create(TinyMceArticle, :profile_id => owner.id, :name => 'ytest')
-    c1 = Comment.create(:title => 'test comment', :body => 'anything', :author => owner, :source => art); c1.save!
+    c1 = Comment.create!(:title => 'test comment', :body => 'anything', :author => owner, :source => art)
 
     assert_includes Article.find_by_contents('anything')[:results], art
   end
diff --git a/plugins/solr/test/unit/category_test.rb b/plugins/solr/test/unit/category_test.rb
index 56f903d..0a7c370 100644
--- a/plugins/solr/test/unit/category_test.rb
+++ b/plugins/solr/test/unit/category_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class CategoryTest < ActiveSupport::TestCase
   def setup
diff --git a/plugins/solr/test/unit/enterprise_test.rb b/plugins/solr/test/unit/enterprise_test.rb
index ba5a9d8..bbca095 100644
--- a/plugins/solr/test/unit/enterprise_test.rb
+++ b/plugins/solr/test/unit/enterprise_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class EnterpriseTest < ActiveSupport::TestCase
   def setup
diff --git a/plugins/solr/test/unit/environment_test.rb b/plugins/solr/test/unit/environment_test.rb
index 2fd3a22..5bf56bf 100644
--- a/plugins/solr/test/unit/environment_test.rb
+++ b/plugins/solr/test/unit/environment_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class EnvironmentTest < ActiveSupport::TestCase
   def setup
diff --git a/plugins/solr/test/unit/event_test.rb b/plugins/solr/test/unit/event_test.rb
index 1d401d1..95315b9 100644
--- a/plugins/solr/test/unit/event_test.rb
+++ b/plugins/solr/test/unit/event_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class EventTest < ActiveSupport::TestCase
   def setup
diff --git a/plugins/solr/test/unit/product_test.rb b/plugins/solr/test/unit/product_test.rb
index fda059b..2403d67 100644
--- a/plugins/solr/test/unit/product_test.rb
+++ b/plugins/solr/test/unit/product_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class ProductTest < ActiveSupport::TestCase
   def setup
diff --git a/plugins/solr/test/unit/profile_test.rb b/plugins/solr/test/unit/profile_test.rb
index 89e5892..c5df2ad 100644
--- a/plugins/solr/test/unit/profile_test.rb
+++ b/plugins/solr/test/unit/profile_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class ProfileTest < ActiveSupport::TestCase
   def setup
diff --git a/plugins/solr/test/unit/search_helper_test.rb b/plugins/solr/test/unit/search_helper_test.rb
index 886daa8..c6ea338 100644
--- a/plugins/solr/test/unit/search_helper_test.rb
+++ b/plugins/solr/test/unit/search_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SearchHelperTest < ActiveSupport::TestCase
 
diff --git a/plugins/solr/test/unit/text_article_test.rb b/plugins/solr/test/unit/text_article_test.rb
index 7f570ae..104ec7b 100644
--- a/plugins/solr/test/unit/text_article_test.rb
+++ b/plugins/solr/test/unit/text_article_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class TextArticleTest < ActiveSupport::TestCase
   def setup
diff --git a/plugins/solr/test/unit/textile_article_test.rb b/plugins/solr/test/unit/textile_article_test.rb
index 332205f..a4730c4 100644
--- a/plugins/solr/test/unit/textile_article_test.rb
+++ b/plugins/solr/test/unit/textile_article_test.rb
@@ -4,7 +4,7 @@ class TextileArticleTest < ActiveSupport::TestCase
   
   should 'define type facet' do
 	  a = TextileArticle.new
-		assert_equal TextArticle.type_name, TextileArticle.send(:f_type_proc, a.send(:f_type))
+		assert_equal TextArticle.type_name, TextileArticle.send(:solr_plugin_f_type_proc, a.send(:solr_plugin_f_type))
   end
 
 end
diff --git a/plugins/solr/test/unit/tiny_mce_article_test.rb b/plugins/solr/test/unit/tiny_mce_article_test.rb
index 13d4b1d..38ae348 100644
--- a/plugins/solr/test/unit/tiny_mce_article_test.rb
+++ b/plugins/solr/test/unit/tiny_mce_article_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.dirname(__FILE__) + '/../test_solr_helper'
 
 class TinyMceArticleTest < ActiveSupport::TestCase
   def setup
@@ -18,6 +19,6 @@ class TinyMceArticleTest < ActiveSupport::TestCase
 
   should 'define type facet' do
 	  a = TinyMceArticle.new
-		assert_equal TextArticle.type_name, TinyMceArticle.send(:f_type_proc, a.send(:f_type))
+		assert_equal TextArticle.type_name, TinyMceArticle.send(:solr_plugin_f_type_proc, a.send(:solr_plugin_f_type))
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 88a12f7..e2fad4a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -59,14 +59,6 @@ class ActiveSupport::TestCase
 
   fixtures :environments, :roles
 
-  def setup
-    TestSolr.disable
-  end
-
-  def teardown
-    TestSolr.disable
-  end
-
   def self.all_fixtures
     Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.yml')).each do |item|
       fixtures File.basename(item).sub(/\.yml$/, '').to_s
--
libgit2 0.21.2