diff --git a/app/models/article.rb b/app/models/article.rb
index 64bad14..27edf41 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -192,7 +192,7 @@ class Article < ActiveRecord::Base
         scoped_methods.last[:find] &&
         scoped_methods.last[:find][:joins] &&
         scoped_methods.last[:find][:joins].index('profiles') )
-      result.includes(:profile)
+      result = result.includes(:profile)
     end
 
     pagination ? result.paginate({:page => 1, :per_page => limit}) : result
diff --git a/test/functional/profile_design_controller_test.rb b/test/functional/profile_design_controller_test.rb
index c768ede..73cd882 100644
--- a/test/functional/profile_design_controller_test.rb
+++ b/test/functional/profile_design_controller_test.rb
@@ -322,11 +322,14 @@ class ProfileDesignControllerTest < ActionController::TestCase
   should 'be able to save FeedReaderBlock configurations' do
     @box1.blocks << FeedReaderBlock.new(:address => 'feed address')
     holder.blocks(true)
+    block = @box1.blocks.last
 
-    post :save, :profile => 'designtestuser', :id => @box1.blocks[-1].id, :block => {:address => 'new feed address', :limit => '20'}
+    post :save, :profile => 'designtestuser', :id => block.id, :block => {:address => 'new feed address', :limit => '20'}
 
-    assert_equal 'new feed address', @box1.blocks[-1].address
-    assert_equal 20, @box1.blocks[-1].limit
+    block.reload
+
+    assert_equal 'new feed address', block.address
+    assert_equal 20, block.limit
   end
 
   should 'require login' do
diff --git a/test/unit/boxes_helper_test.rb b/test/unit/boxes_helper_test.rb
index 87bdead..bf3e5b2 100644
--- a/test/unit/boxes_helper_test.rb
+++ b/test/unit/boxes_helper_test.rb
@@ -46,7 +46,8 @@ class BoxesHelperTest < ActiveSupport::TestCase
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
     b.display = 'never'; b.save!
     box = b.box
-    box.expects(:blocks).returns([b])
+    box.blocks = [b]
+    box.save!
     expects(:display_block).with(b, '')
     expects(:request).returns(request)
     stubs(:block_target).returns('')
@@ -64,7 +65,8 @@ class BoxesHelperTest < ActiveSupport::TestCase
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
     b.display = 'never'; b.save!
     box = b.box
-    box.expects(:blocks).returns([b])
+    box.blocks = [b]
+    box.save!
     expects(:display_block).with(b, '').never
     expects(:request).returns(request)
     stubs(:block_target).returns('')
@@ -106,9 +108,7 @@ class BoxesHelperTest < ActiveSupport::TestCase
 
   should 'fill context with the article, request_path and locale' do
     request = mock()
-    box = mock()
-
-    box.expects(:blocks).returns([])
+    box = Box.create!(:owner => fast_create(Profile))
     request.expects(:path).returns('/')
     expects(:request).returns(request)
     expects(:locale).returns('en')
diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb
index 2e6310e..365f100 100644
--- a/test/unit/enterprise_test.rb
+++ b/test/unit/enterprise_test.rb
@@ -482,9 +482,11 @@ class EnterpriseTest < ActiveSupport::TestCase
 
   should 'reindex products with full category name after save' do
     product = mock
+    products = mock
     product.expects(:category_full_name)
-    Enterprise.any_instance.stubs(:products).returns([product])
-    Enterprise.expects(:solr_batch_add).with(includes(product))
+    products.stubs(:includes).returns([product])
+    Enterprise.any_instance.stubs(:products).returns(products)
+    Enterprise.expects(:solr_batch_add).with([products])
     ent = fast_create(Enterprise)
     ent.save!
   end
--
libgit2 0.21.2