diff --git a/config/initializers/02_postgresql_attachment_fu.rb b/config/initializers/02_postgresql_attachment_fu.rb
new file mode 100644
index 0000000..7068c39
--- /dev/null
+++ b/config/initializers/02_postgresql_attachment_fu.rb
@@ -0,0 +1 @@
+require 'postgresql_attachment_fu'
diff --git a/config/initializers/postgresql_attachment_fu.rb b/config/initializers/postgresql_attachment_fu.rb
deleted file mode 100644
index 7068c39..0000000
--- a/config/initializers/postgresql_attachment_fu.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'postgresql_attachment_fu'
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index 7dbc719..e31e3fd 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -9,7 +9,6 @@ end
 task :test do
   ENV['RAILS_ENV'] = 'test'
   Rake::Task['solr:stop'].invoke
-  Rake::Task['solr:download'].invoke
   Rake::Task['solr:start'].invoke
   errors = %w(test:units test:functionals test:integration cucumber selenium test:noosfero_plugins).collect do |task|
     begin
diff --git a/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake b/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
index 76a6516..f09a223 100644
--- a/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
+++ b/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
@@ -11,15 +11,16 @@ namespace :solr do
     if File.exists?(Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/start.jar')
       puts 'Solr already downloaded.'
     else
-      cd '/tmp'
-      sh "wget -c #{SOLR_URL}"
-      if !File.directory?("/tmp/#{SOLR_DIR}")
-        sh "tar xzf apache-solr-#{SOLR_VERSION}.tgz"
+      Dir.chdir '/tmp' do
+        sh "wget -c #{SOLR_URL}"
+        if !File.directory?("/tmp/#{SOLR_DIR}")
+          sh "tar xzf apache-solr-#{SOLR_VERSION}.tgz"
+        end
+        cd "apache-solr-#{SOLR_VERSION}/example"
+        cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr', :verbose => true
+        cd 'solr'
+        cp_r ['README.txt', 'bin', 'solr.xml'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/solr', :verbose => true
       end
-      cd "apache-solr-#{SOLR_VERSION}/example"
-      cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr', :verbose => true
-      cd 'solr'
-      cp_r ['README.txt', 'bin', 'solr.xml'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/solr', :verbose => true
     end
   end
 
@@ -58,11 +59,11 @@ namespace :solr do
           exec cmd
         else
           pid = fork do
+            Process.setpgrp
             STDERR.close
             exec cmd 
           end
         end
-        sleep(5)
         File.open(SOLR_PID_FILE, "w"){ |f| f << pid} unless windows
         puts "#{ENV['RAILS_ENV']} Solr started successfully on #{SOLR_HOST}:#{SOLR_PORT}, pid: #{pid}."
       end
@@ -78,14 +79,13 @@ namespace :solr do
         File.open(SOLR_PID_FILE, "r") do |f| 
           pid = f.readline
           begin
-            Process.kill('TERM', pid.to_i)
+            Process.kill('TERM', -pid.to_i)
             killed = true
           rescue
             puts "Solr could not be found at pid #{pid.to_i}. Removing pid file."
           end
         end
         File.unlink(SOLR_PID_FILE)
-        Rake::Task["solr:destroy_index"].invoke if ENV['RAILS_ENV'] == 'test'
         puts "Solr shutdown successfully." if killed
       else
         puts "PID file not found at #{SOLR_PID_FILE}. Either Solr is not running or no PID file was written."
--
libgit2 0.21.2