diff --git a/plugins/container_block/lib/ext/block.rb b/plugins/container_block/lib/ext/block.rb
index 0bd1c56..6aad9b3 100644
--- a/plugins/container_block/lib/ext/block.rb
+++ b/plugins/container_block/lib/ext/block.rb
@@ -1,12 +1,10 @@
 require_dependency 'block'
 
 class Block
-  
   def owner_with_container_block_plugin
     owner = owner_without_container_block_plugin
     owner.kind_of?(ContainerBlockPlugin::ContainerBlock) ? owner.owner : owner
   end
 
   alias_method_chain :owner, :container_block_plugin
-
 end
diff --git a/plugins/container_block/lib/ext/environment.rb b/plugins/container_block/lib/ext/environment.rb
index f2c938a..e48c88f 100644
--- a/plugins/container_block/lib/ext/environment.rb
+++ b/plugins/container_block/lib/ext/environment.rb
@@ -1,7 +1,5 @@
 require_dependency 'environment'
 
 class Environment
-  
   include ContainerBlockPlugin::ContainerBlockArray
-
 end
diff --git a/plugins/container_block/lib/ext/profile.rb b/plugins/container_block/lib/ext/profile.rb
index 5967689..ac6f696 100644
--- a/plugins/container_block/lib/ext/profile.rb
+++ b/plugins/container_block/lib/ext/profile.rb
@@ -1,7 +1,5 @@
 require_dependency 'profile'
 
 class Profile
-
   include ContainerBlockPlugin::ContainerBlockArray
-
 end
diff --git a/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb b/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb
index b7dd5de..3dec77d 100644
--- a/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb
+++ b/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 # Re-raise errors caught by the controller.
 class EnvironmentDesignController
diff --git a/plugins/container_block/test/functional/container_block_home_controller_test.rb b/plugins/container_block/test/functional/container_block_home_controller_test.rb
index 7e0031f..b9e062a 100644
--- a/plugins/container_block/test/functional/container_block_home_controller_test.rb
+++ b/plugins/container_block/test/functional/container_block_home_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 # Re-raise errors caught by the controller.
 class HomeController
diff --git a/plugins/container_block/test/functional/container_block_plugin_admin_controller_test.rb b/plugins/container_block/test/functional/container_block_plugin_admin_controller_test.rb
index fdf4a29..86e7786 100644
--- a/plugins/container_block/test/functional/container_block_plugin_admin_controller_test.rb
+++ b/plugins/container_block/test/functional/container_block_plugin_admin_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContainerBlockPluginAdminControllerTest < ActionController::TestCase
 
diff --git a/plugins/container_block/test/functional/container_block_plugin_controller_test.rb b/plugins/container_block/test/functional/container_block_plugin_controller_test.rb
index 71fa3f3..5c2cecf 100644
--- a/plugins/container_block/test/functional/container_block_plugin_controller_test.rb
+++ b/plugins/container_block/test/functional/container_block_plugin_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContainerBlockPluginControllerTest < ActionController::TestCase
 
diff --git a/plugins/container_block/test/functional/container_block_plugin_myprofile_controller_test.rb b/plugins/container_block/test/functional/container_block_plugin_myprofile_controller_test.rb
index 3ed0df0..d5e342e 100644
--- a/plugins/container_block/test/functional/container_block_plugin_myprofile_controller_test.rb
+++ b/plugins/container_block/test/functional/container_block_plugin_myprofile_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContainerBlockPluginMyprofileControllerTest < ActionController::TestCase
 
diff --git a/plugins/container_block/test/test_helper.rb b/plugins/container_block/test/test_helper.rb
deleted file mode 100644
index cca1fd3..0000000
--- a/plugins/container_block/test/test_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test/test_helper'
diff --git a/plugins/container_block/test/unit/block_test.rb b/plugins/container_block/test/unit/block_test.rb
index bff91c9..7b5ccd3 100644
--- a/plugins/container_block/test/unit/block_test.rb
+++ b/plugins/container_block/test/unit/block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class BlockTest < ActiveSupport::TestCase
 
diff --git a/plugins/container_block/test/unit/container_block_plugin/container_block_array_test.rb b/plugins/container_block/test/unit/container_block_plugin/container_block_array_test.rb
index 1dbeebf..276f19f 100644
--- a/plugins/container_block/test/unit/container_block_plugin/container_block_array_test.rb
+++ b/plugins/container_block/test/unit/container_block_plugin/container_block_array_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContainerBlockPlugin::ContainerBlockArrayTest < ActiveSupport::TestCase
 
diff --git a/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb b/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
index 07fa708..45b0ff8 100644
--- a/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
+++ b/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
 
@@ -25,29 +25,28 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
   end
 
   should 'create new blocks when receive block classes' do
-    Block.destroy_all
     @block.save!
-    @block.block_classes = ['Block']
-    assert_equal 2, Block.count
+    assert_difference Block, :count, 1 do
+      @block.block_classes = ['Block']
+    end
     assert_equal Block, Block.last.class
   end
 
   should 'do not create blocks when nothing is passed as block classes' do
-    Block.destroy_all
     @block.save!
-    @block.block_classes = []
-    assert_equal 1, Block.count
+    assert_no_difference Block, :count do
+      @block.block_classes = []
+    end
   end
 
   should 'do not create blocks when nil is passed as block classes' do
-    Block.destroy_all
     @block.save!
-    @block.block_classes = nil
-    assert_equal 1, Block.count
+    assert_no_difference Block, :count do
+      @block.block_classes = nil
+    end
   end
 
   should 'return a list of blocks associated with the container block' do
-    Block.destroy_all
     @block.save!
     @block.block_classes = ['Block', 'Block']
     assert_equal [Block, Block], @block.blocks.map(&:class)
@@ -65,11 +64,11 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
     assert_equal nil, @block.child_width(1)
   end
 
-  should 'return nil at layout_templat' do
+  should 'return nil at layout_template' do
     assert_equal nil, @block.layout_template
   end
 
-  should 'return children blocks that have container box as box' do
+  should 'return children blocks that have container_box as box' do
     @block.save!
     child = Block.create!(:box_id => @block.container_box.id)
     assert_equal [child], @block.blocks
diff --git a/plugins/container_block/test/unit/container_block_plugin_test.rb b/plugins/container_block/test/unit/container_block_plugin_test.rb
index 292503f..5eda25b 100644
--- a/plugins/container_block/test/unit/container_block_plugin_test.rb
+++ b/plugins/container_block/test/unit/container_block_plugin_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContainerBlockPluginTest < ActiveSupport::TestCase
 
diff --git a/plugins/container_block/test/unit/environment_test.rb b/plugins/container_block/test/unit/environment_test.rb
index 1f0613c..f9b5851 100644
--- a/plugins/container_block/test/unit/environment_test.rb
+++ b/plugins/container_block/test/unit/environment_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class EnvironmentTest < ActiveSupport::TestCase
 
diff --git a/plugins/container_block/test/unit/profile_test.rb b/plugins/container_block/test/unit/profile_test.rb
index d12f395..362a0d6 100644
--- a/plugins/container_block/test/unit/profile_test.rb
+++ b/plugins/container_block/test/unit/profile_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ProfileTest < ActiveSupport::TestCase
 
--
libgit2 0.21.2