diff --git a/spec/controllers/permissions_controller_spec.rb b/spec/controllers/permissions_controller_spec.rb
index 5d03a200..2c9df00f 100644
--- a/spec/controllers/permissions_controller_spec.rb
+++ b/spec/controllers/permissions_controller_spec.rb
@@ -15,27 +15,16 @@
   integrate_views
   
   before(:each) do
-    controller.stub!(:login_required).and_return(true)
-    @user = mock_model(Role, :name => 'user')
-    @admin = mock_model(Role, :name => 'admin')
-    @current_user = mock_model(User, :id => 15, :email => 'johndoe@example.com', :admin? => false)
-    @one = mock_model(Calendar, :id => 1, :name => 'Calendar 1')
-    @two = mock_model(Calendar, :id => 2, :name => 'Calendar 2')
-    @three = mock_model(Calendar, :id => 3, :name => 'Calendar 3')
-    Calendar.should_receive(:find) do |arg1, hash|
-      arg1.should == :all
-      hash.should be_an_instance_of Hash
-      hash.should have_key(:conditions)
-      hash[:conditions][0].should =~ /^id NOT IN/
-      [@three]
+    @user = Role.make(:name => 'user')
+    @admin = Role.make(:name => 'admin')
+    @current_user = User.make(:email => 'johndoe@example.com')
+    @one = Calendar.make(:name => 'Calendar 1')
+    @two = Calendar.make(:name => 'Calendar 2')
+    @three = Calendar.make(:name => 'Calendar 3')
+    [{:role => @user, :calendar => @one}, {:role => @admin, :calendar => @two}].each do |opts|
+      @current_user.permissions.make opts
     end
-    @permissions = [
-      mock_model(Permission, :user => @current_user, :role => @user, :calendar => @one),
-      mock_model(Permission, :user => @current_user, :role => @admin, :calendar => @two)
-    ]
-    @permissions.should_receive(:find).and_return(@permissions)
-    @current_user.should_receive(:permissions).and_return(@permissions)
-    User.stub!(:current_user).and_return(@current_user)
+    UserSession.create @current_user
   end
   
   it 'should be a valid action' do
@@ -50,12 +39,12 @@
   
   it "should get all of the current user's permissions" do
     get :index
-    assigns[:permissions].should == @permissions
+    assigns[:permissions].should == @current_user.permissions
   end
   
   it 'should list each subscribed calendar by name in a table' do
     get :index
-    @permissions.each do |p|
+    @current_user.permissions.each do |p|
       cal = p.calendar
       response.should have_tag("tr#permission_#{p.id} td#calendar_#{cal.id}", %r{#{Regexp.escape(ERB::Util::html_escape(cal))}})
     end
@@ -63,18 +52,20 @@
   
   it 'should list the role for each subscribed calendar in the table' do
     get :index
-    @permissions.each do |p|
+    @current_user.permissions.each do |p|
       response.should have_tag("tr#permission_#{p.id} td", %r{#{Regexp.escape(ERB::Util::html_escape(p.role))}})
     end
   end
   
   it 'should have an unsubscribe link for each non-admin subscription' do
+    admin, nonadmin = @current_user.permissions.partition{|p| p.role_id == @admin.id}.collect{|a| a[0]}
     get :index
-    response.should have_tag("tr#permission_#{@permissions[0].id} td.actions a.unsubscribe[href=#{url_for(:action => 'destroy', :id => @permissions[0].id, :escape => false)}]")
-    response.should_not have_tag("tr#permission_#{@permissions[1].id} td.actions a.unsubscribe[href=#{url_for(:action => 'destroy', :id => @permissions[1].id, :escape => false)}]")
+    response.should have_tag("tr#permission_#{nonadmin.id} td.actions a.unsubscribe[href=#{url_for(:action => 'destroy', :id => nonadmin.id, :escape => false)}]")
+    response.should_not have_tag("tr#permission_#{admin.id} td.actions a.unsubscribe[href=#{url_for(:action => 'destroy', :id => admin.id, :escape => false)}]")
   end
   
   it 'should show a list of unsubscribed calendars to subscribe to' do
+    @current_user.permissions.find_by_calendar_id(@three.id).should be_nil
     get :index
     response.should have_tag("table.unsubscribed tr#calendar_#{@three.id}") do |r|
       r.should have_tag("a[href=#{subscribe_path(:calendar_id => @three.id)}]")
@@ -93,15 +84,13 @@
   end
   
   it 'should show all available calendars under "unsubscribed"' do
-    @blank = []
-    @blank.should_receive(:find).and_return([])
-    @current_user = mock_model(User, :id => 20, :email => 'no_permissions@gmail.com', :admin? => false)
-    @current_user.should_receive(:permissions).and_return(@blank)
-    @calendars = [mock_model(Calendar, :id => 1), mock_model(Calendar, :id => 2)]
-    Calendar.should_receive(:find).with(:all).and_return(@calendars)
-    User.stub!(:current_user).and_return(@current_user)
+    @current_user = User.make(:id => 20, :email => 'no_permissions@gmail.com')
+    2.times do
+      Calendar.make
+    end
+    UserSession.create @current_user
     get :index
-    assigns[:permissions].should == @blank
+    assigns[:permissions].should be_empty
     
     response.should have_tag('table.unsubscribed')
   end
@@ -109,7 +98,7 @@
   
 describe PermissionsController, 'index (no unsubscribed calendars)' do
   it 'should not show the list of unsubscribed calendars if there are none' do
-    Calendar.stub!(:find).and_return(nil)
+    Calendar.count.should == 0
     get :index
     assigns[:unsubscribed].should be_nil
     response.should_not have_tag('table.unsubscribed')
@@ -118,33 +107,33 @@
 
 describe PermissionsController, 'subscribe' do
   before(:each) do
-    Calendar.stub!(:find).and_return(mock_model(Calendar, :id => 1))
-    @user = mock_model(Role, :id => 20, :name => 'user')
-    Role.stub!(:find_by_name).and_return(@user)
-    @params = {:calendar_id => 1}
-    @pcount = Permission.count
-    @current_user = mock_model(User, :email => 'test@example.com', :id => 18)
-    controller.stub!(:login_required).and_return(true)
+    @calendar = Calendar.make
+    @user = Role.make(:id => 20, :name => 'user')
+    @params = {:calendar_id => @calendar.id}
+    @current_user = User.make(:email => 'test@example.com', :id => 18)
     controller.stub!(:check_admin).and_return(false)
-    User.stub!(:current_user).and_return(@current_user)
-    get :subscribe, :calendar_id => 1
+    UserSession.create @current_user
   end
   
   it 'should be a valid non-admin action' do
+    get :subscribe, :calendar_id => @calendar.id
     response.should be_redirect
   end
   
   it 'should create a new permission for the current user and the given calendar' do
+    @pcount = Permission.count
+    get :subscribe, :calendar_id => @calendar.id
     Permission.count.should == @pcount + 1
-    Permission.find(:first, :conditions => {:calendar_id => 1, :user_id => @current_user.id, :role_id => @user.id}).should_not be_nil
+    Permission.find(:first, :conditions => {:calendar_id => @calendar.id, :user_id => @current_user.id, :role_id => @user.id}).should_not be_nil
   end
 end
 
 describe PermissionsController, 'destroy' do
   before(:each) do
     controller.stub!(:login_required).and_return(true)
-    @current_user = mock_model(User, :id => 12, :email => 'johndoe@example.com', :admin? => false)
-    User.stub!(:current_user).and_return(@current_user)
+    @current_user = User.make(:id => 12, :email => 'johndoe@example.com')
+    @current_user.stub!(:admin?).and_return false
+    UserSession.create @current_user
     request.env['HTTP_REFERER'] = 'referer'
   end
   
@@ -155,14 +144,14 @@
   end
   
   it 'should delete the Permission given by the id parameter if it belongs to the current user' do
-    @mine = mock_model(Permission, :id => 90, :null_object => true, :user_id => @current_user.id)
+    @mine = @current_user.permissions.make(:id => 90)
     @mine.should_receive(:destroy)
     Permission.should_receive(:find).with(@mine.id.to_param).and_return(@mine)
     get :destroy, :id => @mine.id
   end
   
   it 'should not delete the Permission given by the id parameter if it does not belong to the current user' do
-    @notmine = mock_model(Permission, :id => 91, :null_object => true, :user_id => @current_user.id + 3)
+    @notmine = User.make.permissions.make(:id => 91)
     @notmine.should_not_receive(:destroy)
     Permission.should_receive(:find).with(@notmine.id.to_param).and_return(@notmine)
     get :destroy, :id => @notmine.id