diff --git a/Rakefile b/Rakefile
index e8e03b8..3c45e64 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,7 +7,7 @@ require 'rake'
 
 module ::Nineminutes
   class Application
-    include Rake::DSL
+    include Rake::DSL if Rails.env.development? or Rails.env.test?
     # Jammit.package!
   end
 end
diff --git a/config/initializers/app_config.rb b/config/initializers/app_config.rb
index a9716b6..46d2058 100644
--- a/config/initializers/app_config.rb
+++ b/config/initializers/app_config.rb
@@ -1,4 +1,4 @@
-if Rails.env !=~ /production/
+if Rails.env.development? || Rails.env.test?
   APP_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.open(File.join(Rails.root, 'config', 'config.yml'))))
   APP_CONFIG.each do |key, value|
     if value.is_a?(Hash)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3e088f0..6ded5ce 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -183,12 +183,12 @@ Devise.setup do |config|
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
   
-  # Facebook-Setting for Heroku
-  if Rails.env =~ /production/
+  if Rails.env.development? or Rails.env.test?
+    config.omniauth :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_SECRET']
+  else
+    # Facebook-Setting for Heroku
     config.omniauth :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_SECRET']
       {:scope => 'email, offline_access', :client_options => {:ssl => {:ca_file => '/usr/lib/ssl/certs/ca-certificates.crt'}}}
-  else
-    config.omniauth :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_SECRET']
   end
   
   config.omniauth :open_id, OpenID::Store::Filesystem.new('/tmp')
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index b7a0a4e..673882b 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -5,5 +5,5 @@ begin
   $redis.ping
   puts "=> Established connection to redis server on '#{uri.host}' (port #{uri.port})!"
 rescue
-  puts "=> CAUTION: cound not establish connection to redis server on '#{uri.host}' (port #{uri.port})! Check settings in initializer!"
+  puts "=> CAUTION: could not establish connection to redis server on '#{uri.host}' (port #{uri.port})! Check settings in initializer!"
 end
\ No newline at end of file