diff --git a/agent/test/helper.rb b/agent/test/helper.rb
index <HASH>..<HASH> 100644
--- a/agent/test/helper.rb
+++ b/agent/test/helper.rb
@@ -75,4 +75,6 @@ class MiniTest::Unit::TestCase
 
 end
 
+Dir.glob(File.dirname(__FILE__) + "/../lib/**/*.rb").each{ |f| require f }
+
 MiniTest::Unit.autorun
diff --git a/agent/test/test_agent.rb b/agent/test/test_agent.rb
index <HASH>..<HASH> 100644
--- a/agent/test/test_agent.rb
+++ b/agent/test/test_agent.rb
@@ -20,22 +20,6 @@ class TestDevopsAgent < MiniTest::Unit::TestCase
     FileUtils.copy_entry(src, dest)
   end
 
-  # minitest assert_throws doesn't seem to work properly
-  def assert_throws(clazz, msg = nil, &block)
-    begin
-      yield
-    rescue Exception => ex
-      if clazz.to_s == ex.class.name then
-        if msg.nil?
-          return
-        elsif msg == ex.message then
-          return
-        end
-      end
-    end
-    flunk("Expected #{mu_pp(clazz)} to have been thrown")
-  end
-
   def test_create_new_agent
     @agent = Agent.create(@manager_uri, @password, @root_dir, @port)
     @agent.save_config()
require all lib files for proper coverage report; cleanup