diff --git a/test/common/ts_common.rb b/test/common/ts_common.rb
new file mode 100644
index 000000000..25ebc2b03
--- /dev/null
+++ b/test/common/ts_common.rb
@@ -0,0 +1,31 @@
+#
+#   Copyright 2012 Wade Alcorn wade@bindshell.net
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# @note Version check to ensure BeEF is running Ruby 1.9 >
+if  RUBY_VERSION < '1.9'
+  puts "\n"
+  puts "Ruby version " + RUBY_VERSION + " is no longer supported. Please upgrade 1.9 or later."
+  puts "\n"
+  exit
+end
+
+begin
+  require 'test/unit/ui/console/testrunner'
+rescue LoadError
+  puts "The following instruction failed: require 'test/unit/ui/console/testrunner'"
+  puts "Please run: sudo gem install test-unit-full"
+  exit
+end
diff --git a/test/unit/ts_beef.rb b/test/unit/ts_unit.rb
similarity index 52%
rename from test/unit/ts_beef.rb
rename to test/unit/ts_unit.rb
index c5018deed..3e371a7a6 100644
--- a/test/unit/ts_beef.rb
+++ b/test/unit/ts_unit.rb
@@ -14,41 +14,9 @@
 #   limitations under the License.
 #
 
-# @note Version check to ensure BeEF is running Ruby 1.9 >
-if  RUBY_VERSION < '1.9'
-  puts "\n"
-  puts "Ruby version " + RUBY_VERSION + " is no longer supported. Please upgrade 1.9 or later."
-  puts "\n"
-  exit
-end
+# Common lib for BeEF tests
+require '../common/ts_common'
 
-begin
-  require 'test/unit/ui/console/testrunner'
-rescue LoadError
-  puts "The following instruction failed: require 'test/unit/ui/console/testrunner'"
-  puts "Please run: sudo gem install test-unit-full"
-  exit
-end
-
-begin
-  require 'curb'
-rescue LoadError
-  puts "The following instruction failed: require 'curb'"
-  puts "Please run: sudo gem install curb"
-  exit
-end
-
-if (ARGV[0] != 'no_msf')
-  begin
-    require 'msfrpc-client'
-  rescue LoadError
-    puts "The following instruction failed: require 'msfrpc-client'"
-    puts "Please run: sudo gem install msfrpc-client"
-    exit
-  end
-end
-
-require './core/main/network_stack/handlers/dynamicreconstruction.rb'
 require './core/filter/tc_base'
 require './core/filter/tc_command'
 require './core/tc_loader'
@@ -56,10 +24,10 @@ require './core/tc_core'
 require './core/tc_api'
 require './tc_grep'
 require './tc_filesystem'
-require './extensions/tc_metasploit' unless (ARGV[0] == 'no_msf')
 
 class TS_BeefTests
   def self.suite
+
     suite = Test::Unit::TestSuite.new(name="BeEF TestSuite")
     suite << TC_Filter.suite
     suite << TC_Loader.suite
@@ -67,8 +35,7 @@ class TS_BeefTests
     suite << TC_Api.suite
     suite << TC_Filesystem.suite
     suite << TC_Grep.suite
-    #suite << TC_DynamicReconstruction.suite
-    suite << TC_Metasploit.suite unless (ARGV[0] == 'no_msf')
+
     return suite
   end
 end