diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 257d989cf1..3d246acab8 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -4,7 +4,10 @@
     %meta{name: 'viewport', content: "width=device-width,initial-scale=1.0"}/
 
     %title= content_for?(:title) ? yield(:title) : 'Welcome to Open Food Network'
-    = favicon_link_tag "favicon.png"
+    - if Rails.env.production?
+      = favicon_link_tag
+    - else
+      = favicon_link_tag "/favicon-staging.ico"
     %link{href: "https://fonts.googleapis.com/css?family=Open+Sans:400,700", rel: "stylesheet", type: "text/css"}/
 
     = yield :scripts
diff --git a/public/favicon-production.ico b/public/favicon-production.ico
deleted file mode 100644
index 9e0f9a2681..0000000000
Binary files a/public/favicon-production.ico and /dev/null differ
diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29bb2..9e0f9a2681 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index babb1c84e6..5cd2b0cda8 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -14,14 +14,15 @@ describe HomeController do
     assigns[:active_distributors].should == [distributor]
   end
 
-  it "does not show invisible hubs" do
+  # Exclusion from actual rendered view handled in features/consumer/home
+  it "shows JSON for invisible hubs" do
     get :index
-    response.body.should_not have_content invisible_distributor.name
+    response.body.should have_content invisible_distributor.name
   end
   
-  # This is done inside the json/hubs RABL template
+  # This is done inside the json/hubs Serializer
   it "gets the next order cycle for each hub" do
-    OrderCycle.should_receive(:first_closing_for).with(distributor)
+    OrderCycle.should_receive(:first_closing_for).twice
     get :index
   end
 end
diff --git a/spec/controllers/producers_controller_spec.rb b/spec/controllers/producers_controller_spec.rb
index d5a90a77d3..812b08892f 100644
--- a/spec/controllers/producers_controller_spec.rb
+++ b/spec/controllers/producers_controller_spec.rb
@@ -5,7 +5,7 @@ describe ProducersController do
 
   before do
     Enterprise.stub(:distributors_with_active_order_cycles).and_return [distributor]
-    Enterprise.stub(:visible).and_return [distributor]
+    Enterprise.stub(:all).and_return [distributor]
   end
 
   it "sets active distributors" do