diff --git a/spec/views/crops/index.html.haml_spec.rb b/spec/views/crops/index.html.haml_spec.rb
index 89e1d8941..ec243685b 100644
--- a/spec/views/crops/index.html.haml_spec.rb
+++ b/spec/views/crops/index.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "crops/index" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     assign(:crops, [
       FactoryGirl.create(:tomato),
       FactoryGirl.create(:maize)
@@ -24,6 +24,7 @@ describe "crops/index" do
     before(:each) do
       @member = FactoryGirl.create(:member)
       sign_in @member
+      controller.stub(:current_user) { @member }
       render
     end
 
diff --git a/spec/views/crops/new.html.haml_spec.rb b/spec/views/crops/new.html.haml_spec.rb
index 0d501068c..c44b8d5d9 100644
--- a/spec/views/crops/new.html.haml_spec.rb
+++ b/spec/views/crops/new.html.haml_spec.rb
@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe "crops/new" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
     assign(:crop, FactoryGirl.create(:maize))
     @member = FactoryGirl.create(:member)
     sign_in @member
+    controller.stub(:current_user) { @member }
     render
   end
 
diff --git a/spec/views/crops/show.html.haml_spec.rb b/spec/views/crops/show.html.haml_spec.rb
index cfdf70c16..86ee3bb58 100644
--- a/spec/views/crops/show.html.haml_spec.rb
+++ b/spec/views/crops/show.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "crops/show" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @crop = FactoryGirl.create(:maize,
       :scientific_names => [ FactoryGirl.create(:zea_mays) ]
     )
@@ -49,6 +49,7 @@ describe "crops/show" do
     before(:each) do
       @member = FactoryGirl.create(:member)
       sign_in @member
+      controller.stub(:current_user) { @member }
       render
     end
 
diff --git a/spec/views/gardens/edit.html.haml_spec.rb b/spec/views/gardens/edit.html.haml_spec.rb
index 39a4445f6..53063d12a 100644
--- a/spec/views/gardens/edit.html.haml_spec.rb
+++ b/spec/views/gardens/edit.html.haml_spec.rb
@@ -4,9 +4,9 @@ describe "gardens/edit" do
 
   context "logged in" do
     before(:each) do
-      controller.stub(:current_user) { Member.new }
       @owner = FactoryGirl.create(:member)
       sign_in @owner
+      controller.stub(:current_user) { @owner }
       @garden = assign(:garden, FactoryGirl.create(:garden, :owner => @owner))
       render
     end
diff --git a/spec/views/gardens/index.html.haml_spec.rb b/spec/views/gardens/index.html.haml_spec.rb
index a0a85e1dd..7a72b854a 100644
--- a/spec/views/gardens/index.html.haml_spec.rb
+++ b/spec/views/gardens/index.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "gardens/index" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @owner = FactoryGirl.create(:member)
     assign(:gardens, [
       FactoryGirl.create(:garden, :owner => @owner),
diff --git a/spec/views/members/show.html.haml_spec.rb b/spec/views/members/show.html.haml_spec.rb
index 51f5561e6..b5f22735e 100644
--- a/spec/views/members/show.html.haml_spec.rb
+++ b/spec/views/members/show.html.haml_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "members/show" do
 
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @member = FactoryGirl.create(:member)
     @time = @member.created_at
 
diff --git a/spec/views/plantings/_form.html.haml_spec.rb b/spec/views/plantings/_form.html.haml_spec.rb
index b080bf9d1..dc227118b 100644
--- a/spec/views/plantings/_form.html.haml_spec.rb
+++ b/spec/views/plantings/_form.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "plantings/_form" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @member = FactoryGirl.create(:member)
     @garden = FactoryGirl.create(:garden, :owner => @member)
     @uppercase = FactoryGirl.create(:uppercasecrop)
diff --git a/spec/views/plantings/_thumbnail.html.haml_spec.rb b/spec/views/plantings/_thumbnail.html.haml_spec.rb
index 903d6c703..3e55d08ea 100644
--- a/spec/views/plantings/_thumbnail.html.haml_spec.rb
+++ b/spec/views/plantings/_thumbnail.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "plantings/_thumbnail" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @member = FactoryGirl.create(:member)
     @garden = FactoryGirl.create(:garden, :owner => @member)
     @crop = FactoryGirl.create(:tomato)
diff --git a/spec/views/plantings/index.html.haml_spec.rb b/spec/views/plantings/index.html.haml_spec.rb
index b6cb6500b..1b026ac6d 100644
--- a/spec/views/plantings/index.html.haml_spec.rb
+++ b/spec/views/plantings/index.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "plantings/index" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @member   = FactoryGirl.create(:member)
     @garden = FactoryGirl.create(:garden, :owner => @member)
     @tomato = FactoryGirl.create(:tomato)
diff --git a/spec/views/plantings/index.rss.builder_spec.rb b/spec/views/plantings/index.rss.builder_spec.rb
index cc1b8a949..abc847d45 100644
--- a/spec/views/plantings/index.rss.builder_spec.rb
+++ b/spec/views/plantings/index.rss.builder_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'plantings/index.rss.builder', :type => "view" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     assign(:recent_plantings, [
       FactoryGirl.create(:planting)
     ])
diff --git a/spec/views/plantings/show.html.haml_spec.rb b/spec/views/plantings/show.html.haml_spec.rb
index d6feb9041..0b46bd94e 100644
--- a/spec/views/plantings/show.html.haml_spec.rb
+++ b/spec/views/plantings/show.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "plantings/show" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @member = FactoryGirl.create(:member)
     @garden = FactoryGirl.create(:garden, :owner => @member)
     @crop = FactoryGirl.create(:tomato)
diff --git a/spec/views/posts/edit.html.haml_spec.rb b/spec/views/posts/edit.html.haml_spec.rb
index e024987ec..bb67e9dfa 100644
--- a/spec/views/posts/edit.html.haml_spec.rb
+++ b/spec/views/posts/edit.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "posts/edit" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @author = FactoryGirl.create(:member)
     @post = assign(:post, FactoryGirl.create(:post, :author => @author))
   end
diff --git a/spec/views/posts/index.html.haml_spec.rb b/spec/views/posts/index.html.haml_spec.rb
index ee14ac65a..fd73a3a9f 100644
--- a/spec/views/posts/index.html.haml_spec.rb
+++ b/spec/views/posts/index.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "posts/index" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @author = FactoryGirl.create(:member)
     @post1 = FactoryGirl.build(:post, :author => @author)
     @post2 = FactoryGirl.build(:post, :author => @author)
diff --git a/spec/views/posts/index.rss.builder_spec.rb b/spec/views/posts/index.rss.builder_spec.rb
index c3e8d1ed6..f2b6c87e4 100644
--- a/spec/views/posts/index.rss.builder_spec.rb
+++ b/spec/views/posts/index.rss.builder_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'posts/index.rss.builder', :type => "view" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @author = FactoryGirl.create(:member)
     assign(:recent_posts, [
       FactoryGirl.build(:post, :id => 1, :author => @author),
diff --git a/spec/views/posts/show.html.haml_spec.rb b/spec/views/posts/show.html.haml_spec.rb
index ed1d185b6..d42cff34a 100644
--- a/spec/views/posts/show.html.haml_spec.rb
+++ b/spec/views/posts/show.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "posts/show" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @author = FactoryGirl.create(:member)
   end
 
diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb
index 7a6577a08..b7b6ab19e 100644
--- a/spec/views/scientific_names/edit.html.haml_spec.rb
+++ b/spec/views/scientific_names/edit.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "scientific_names/edit" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @scientific_name = assign(:scientific_name,
       FactoryGirl.create(:zea_mays)
     )
diff --git a/spec/views/scientific_names/index.html.haml_spec.rb b/spec/views/scientific_names/index.html.haml_spec.rb
index 22d83af1e..aeffb66a8 100644
--- a/spec/views/scientific_names/index.html.haml_spec.rb
+++ b/spec/views/scientific_names/index.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "scientific_names/index" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     assign(:scientific_names, [
       FactoryGirl.create(:zea_mays),
       FactoryGirl.create(:solanum_lycopersicum) 
diff --git a/spec/views/scientific_names/show.html.haml_spec.rb b/spec/views/scientific_names/show.html.haml_spec.rb
index 3018b6838..6fbb95e42 100644
--- a/spec/views/scientific_names/show.html.haml_spec.rb
+++ b/spec/views/scientific_names/show.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "scientific_names/show" do
   before(:each) do
-    controller.stub(:current_user) { Member.new }
+    controller.stub(:current_user) { nil }
     @scientific_name = assign(:scientific_name,
       FactoryGirl.create(:zea_mays)
     )