diff --git a/lib/create_thumbnails_job.rb b/lib/create_thumbnails_job.rb
index b9dc034..a3d4e19 100644
--- a/lib/create_thumbnails_job.rb
+++ b/lib/create_thumbnails_job.rb
@@ -1,9 +1,7 @@
 class CreateThumbnailsJob < Struct.new(:class_name, :file_id)
   def perform
     return unless class_name.constantize.exists?(file_id)
-    Article.disable_ferret # acts_as_ferret sucks
     file = class_name.constantize.find(file_id)
     file.create_thumbnails
-    Article.enable_ferret # acts_as_ferret sucks
   end
 end
diff --git a/test/unit/environment_finder_test.rb b/test/unit/environment_finder_test.rb
index 855d0b8..457e58b 100644
--- a/test/unit/environment_finder_test.rb
+++ b/test/unit/environment_finder_test.rb
@@ -78,10 +78,10 @@ class EnvironmentFinderTest < ActiveSupport::TestCase
     finder = EnvironmentFinder.new(Environment.default)
     
     region = fast_create(Region, :name => 'r-test', :environment_id => Environment.default.id, :lat => 45.0, :lng => 45.0)
-    ent1 = fast_create(Enterprise, :name => 'test 1', :identifier => 'test1', :lat => 45.0, :lng => 45.0)
+    ent1 = fast_create(Enterprise, {:name => 'test 1', :identifier => 'test1', :lat => 45.0, :lng => 45.0}, :search => true)
     p1 = create_user('test2').person
     p1.name = 'test 2'; p1.lat = 45.0; p1.lng = 45.0; p1.save!
-    ent2 = fast_create(Enterprise, :name => 'test 3', :identifier => 'test3', :lat => 30.0, :lng => 30.0)
+    ent2 = fast_create(Enterprise, {:name => 'test 3', :identifier => 'test3', :lat => 30.0, :lng => 30.0}, :search => true)
     p2 = create_user('test4').person
     p2.name = 'test 4'; p2.lat = 30.0; p2.lng = 30.0; p2.save!
 
diff --git a/test/unit/forum_helper_test.rb b/test/unit/forum_helper_test.rb
index a0f0c84..cbeccbf 100644
--- a/test/unit/forum_helper_test.rb
+++ b/test/unit/forum_helper_test.rb
@@ -50,14 +50,14 @@ class ForumHelperTest < Test::Unit::TestCase
     some_post.comments << Comment.new(:title => 'test', :body => 'test', :author => a2)
     c = Comment.last
     assert_equal 2, some_post.comments.count
-    assert_match /#{c.created_at.to_s} ago by <a href='[^']+'>a2<\/a>/, last_topic_update(some_post)
+    assert_match(/#{Regexp.escape(c.created_at.to_s)} ago by <a href='[^']+'>a2<\/a>/, last_topic_update(some_post))
   end
 
   should "return last comment author's name from unauthenticated user" do
     some_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => forum, :published => true)
     some_post.comments << Comment.new(:name => 'John', :email => 'lenon@example.com', :title => 'test', :body => 'test')
     c = Comment.last
-    assert_match /#{c.created_at.to_s} ago by John/m, last_topic_update(some_post)
+    assert_match(/#{Regexp.escape(c.created_at.to_s)} ago by John/m, last_topic_update(some_post))
   end
 
   protected
--
libgit2 0.21.2