diff --git a/.gitignore b/.gitignore
index 5cf1f029..393e194d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ doc/bushido
 *.swp
 .sass-cache/
 spec/dummy/tmp/
+spec/dummy/spec/tmp
 spec/dummy/log/*.log
 app/assets/javascripts/old/
 app/assets/stylesheets/old/
diff --git a/Gemfile b/Gemfile
index f95e9b33..331b1828 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,8 +50,6 @@ gem 'delayed_job',          '~> 2.1.1'
 gem 'delayed_job_mongoid',  '~> 1.0.4'
 gem 'SystemTimer',          :platforms => :ruby_18
 
-
-
 # The rest of the dependencies are for use when in the locomotive dev environment
 
 group :development do
diff --git a/spec/cells/admin/global_actions_spec.rb b/spec/cells/locomotive/global_actions_spec.rb
similarity index 92%
rename from spec/cells/admin/global_actions_spec.rb
rename to spec/cells/locomotive/global_actions_spec.rb
index 4b4c8297..d9821fb1 100644
--- a/spec/cells/admin/global_actions_spec.rb
+++ b/spec/cells/locomotive/global_actions_spec.rb
@@ -1,8 +1,9 @@
 require 'spec_helper'
 
-describe Admin::GlobalActionsCell do
-
-  render_views
+describe Locomotive::GlobalActionsCell do
+  # FIXME: This does not seem to work correctly, rspec-cells should allow this to be called
+  # as if it were a controller.
+  # render_views
 
   let(:menu) { render_cell('admin/global_actions', :show, :current_locomotive_account => FactoryGirl.build('admin user'), :current_site_url => 'http://www.yahoo.fr') }
 
@@ -86,4 +87,4 @@ describe Admin::GlobalActionsCell do
    CellsResetter.clean!
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/cells/admin/main_menu_cell_spec.rb b/spec/cells/locomotive/main_menu_cell_spec.rb
similarity index 91%
rename from spec/cells/admin/main_menu_cell_spec.rb
rename to spec/cells/locomotive/main_menu_cell_spec.rb
index ea2e1224..4dc24ed5 100644
--- a/spec/cells/admin/main_menu_cell_spec.rb
+++ b/spec/cells/locomotive/main_menu_cell_spec.rb
@@ -1,8 +1,9 @@
 require 'spec_helper'
 
-describe Admin::MainMenuCell do
-
-  render_views
+describe Locomotive::MainMenuCell do
+  # FIXME: This does not seem to work correctly, rspec-cells should allow this to be called
+  # as if it were a controller.
+  # render_views
 
   let(:menu) { render_cell('admin/main_menu', :show) }
 
@@ -82,4 +83,4 @@ describe Admin::MainMenuCell do
     CellsResetter.clean!
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/cells/admin/settings_menu_cell_spec.rb b/spec/cells/locomotive/settings_menu_cell_spec.rb
similarity index 91%
rename from spec/cells/admin/settings_menu_cell_spec.rb
rename to spec/cells/locomotive/settings_menu_cell_spec.rb
index 95db40b8..2ac44e18 100644
--- a/spec/cells/admin/settings_menu_cell_spec.rb
+++ b/spec/cells/locomotive/settings_menu_cell_spec.rb
@@ -1,8 +1,9 @@
 require 'spec_helper'
 
-describe Admin::SettingsMenuCell do
-
-  render_views
+describe Locomotive::SettingsMenuCell do
+  # FIXME: This does not seem to work correctly, rspec-cells should allow this to be called
+  # as if it were a controller.
+  # render_views
 
   let(:menu) { render_cell('admin/settings_menu', :show) }
 
@@ -86,4 +87,4 @@ describe Admin::SettingsMenuCell do
    CellsResetter.clean!
   end
 
-end
\ No newline at end of file
+end