diff --git a/t/Account.t b/t/Account.t
index 2cd2a29c0..bbb25d291 100644
--- a/t/Account.t
+++ b/t/Account.t
@@ -12,9 +12,7 @@
 # This tests the operation of WebGUI::Account modules. You can use
 # as a base to test your own modules.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Account/Friends.t b/t/Account/Friends.t
index 298427cf4..33094350b 100644
--- a/t/Account/Friends.t
+++ b/t/Account/Friends.t
@@ -12,9 +12,7 @@
 # This tests the operation of WebGUI::Account modules. You can use
 # as a base to test your own modules.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/AdSpace.t b/t/AdSpace.t
index 0f2ae3e2b..22b895562 100644
--- a/t/AdSpace.t
+++ b/t/AdSpace.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::AdSpace::Ad;
diff --git a/t/AdSpace/Ad.t b/t/AdSpace/Ad.t
index cb526d283..1f68118a7 100644
--- a/t/AdSpace/Ad.t
+++ b/t/AdSpace/Ad.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::AdSpace;
diff --git a/t/Asset.t b/t/Asset.t
index e7c1de76a..00aaf5485 100644
--- a/t/Asset.t
+++ b/t/Asset.t
@@ -8,11 +8,9 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
 no warnings qw(uninitialized);
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 
diff --git a/t/Asset/Asset.t b/t/Asset/Asset.t
index 6f8ca500e..d2cd41e99 100644
--- a/t/Asset/Asset.t
+++ b/t/Asset/Asset.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Test::Maker::Permission;
diff --git a/t/Asset/AssetClipboard.t b/t/Asset/AssetClipboard.t
index 7a1afe372..0b25a080e 100644
--- a/t/Asset/AssetClipboard.t
+++ b/t/Asset/AssetClipboard.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to check the creation and purging of
 ##versions.
diff --git a/t/Asset/AssetExportHtml.t b/t/Asset/AssetExportHtml.t
index 1b2c55338..969b62df4 100644
--- a/t/Asset/AssetExportHtml.t
+++ b/t/Asset/AssetExportHtml.t
@@ -12,9 +12,7 @@
 #  These tests are for the shiny rewritten export functionality. it tries
 #  really hard to test every permutation of the code.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 
diff --git a/t/Asset/AssetLineage.t b/t/Asset/AssetLineage.t
index c59f5270c..209bdf580 100644
--- a/t/Asset/AssetLineage.t
+++ b/t/Asset/AssetLineage.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Asset/AssetMetaData.t b/t/Asset/AssetMetaData.t
index 95c891265..a22c00ff3 100644
--- a/t/Asset/AssetMetaData.t
+++ b/t/Asset/AssetMetaData.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to check the creation and purging of
 ##versions.
diff --git a/t/Asset/AssetPackage.t b/t/Asset/AssetPackage.t
index 89e8ff92b..70d3d1240 100644
--- a/t/Asset/AssetPackage.t
+++ b/t/Asset/AssetPackage.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to check the creation and purging of
 ##versions.
diff --git a/t/Asset/AssetTrash.t b/t/Asset/AssetTrash.t
index bdad74ac7..fae25ddbb 100644
--- a/t/Asset/AssetTrash.t
+++ b/t/Asset/AssetTrash.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Asset/AssetVersion.t b/t/Asset/AssetVersion.t
index d2ac13292..a25e14cab 100644
--- a/t/Asset/AssetVersion.t
+++ b/t/Asset/AssetVersion.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to check the creation and purging of
 ##versions.
diff --git a/t/Asset/Asset_diagnose.t b/t/Asset/Asset_diagnose.t
index 9d378e6c2..6c4d11893 100644
--- a/t/Asset/Asset_diagnose.t
+++ b/t/Asset/Asset_diagnose.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to look for orphaned assetIds across
 ##all assets in the Asset's main table, and the asset and assetData tables.
diff --git a/t/Asset/EMSSubmissionForm.t b/t/Asset/EMSSubmissionForm.t
index 0f60831ce..ff3ce2372 100644
--- a/t/Asset/EMSSubmissionForm.t
+++ b/t/Asset/EMSSubmissionForm.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Test::Warn;
diff --git a/t/Asset/Event.t b/t/Asset/Event.t
index f14874b56..fd9fa8d2d 100644
--- a/t/Asset/Event.t
+++ b/t/Asset/Event.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Asset/Event/edit.t b/t/Asset/Event/edit.t
index 3cb86bb38..8b79c3efa 100644
--- a/t/Asset/Event/edit.t
+++ b/t/Asset/Event/edit.t
@@ -13,9 +13,7 @@
 # assets.
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Asset/Event/permissions.t b/t/Asset/Event/permissions.t
index 14105f4a1..2e3e32ec7 100644
--- a/t/Asset/Event/permissions.t
+++ b/t/Asset/Event/permissions.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Test::Maker::Permission;
diff --git a/t/Asset/Event/recur.t b/t/Asset/Event/recur.t
index 29efce18d..0d6158c3e 100644
--- a/t/Asset/Event/recur.t
+++ b/t/Asset/Event/recur.t
@@ -13,8 +13,6 @@
 
 use strict;
 
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
 
 use Test::More;
 use DateTime;
diff --git a/t/Asset/File.t b/t/Asset/File.t
index 0647906fa..58cf8126c 100644
--- a/t/Asset/File.t
+++ b/t/Asset/File.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use Test::MockObject;
 my $mocker = Test::MockObject->new();
diff --git a/t/Asset/File/GalleryFile/Photo/00base.t b/t/Asset/File/GalleryFile/Photo/00base.t
index c219967ee..50d60e518 100644
--- a/t/Asset/File/GalleryFile/Photo/00base.t
+++ b/t/Asset/File/GalleryFile/Photo/00base.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 ## The goal of this test is to test the creation and deletion of photo assets
 
diff --git a/t/Asset/File/GalleryFile/Photo/adjustOrientation.t b/t/Asset/File/GalleryFile/Photo/adjustOrientation.t
index 9545b0e6b..725f3d27c 100644
--- a/t/Asset/File/GalleryFile/Photo/adjustOrientation.t
+++ b/t/Asset/File/GalleryFile/Photo/adjustOrientation.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 # Test the 'adjustOrientation' method called by 'applyConstraints'. It is 
 # responsible for rotating JPEG images according to orientation information
diff --git a/t/Asset/File/GalleryFile/Photo/comment.t b/t/Asset/File/GalleryFile/Photo/comment.t
index bd8763cb3..4174a5cd8 100644
--- a/t/Asset/File/GalleryFile/Photo/comment.t
+++ b/t/Asset/File/GalleryFile/Photo/comment.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 ## The goal of this test is to test the adding, deleting, editing, and 
 # getting comments for photos
diff --git a/t/Asset/File/GalleryFile/Photo/download.t b/t/Asset/File/GalleryFile/Photo/download.t
index 4001af2eb..f42baa1bf 100644
--- a/t/Asset/File/GalleryFile/Photo/download.t
+++ b/t/Asset/File/GalleryFile/Photo/download.t
@@ -11,9 +11,7 @@
 # The goal of this test is to test the getDownloadFileUrl and www_download()
 # methods
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Asset/File/GalleryFile/Photo/edit.t b/t/Asset/File/GalleryFile/Photo/edit.t
index 1a9d4b4a0..1d4aa7345 100644
--- a/t/Asset/File/GalleryFile/Photo/edit.t
+++ b/t/Asset/File/GalleryFile/Photo/edit.t
@@ -11,9 +11,7 @@
 
 # This script tests the edit and saving of Photo assets
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 use Test::More;
 use Test::Deep;
diff --git a/t/Asset/File/GalleryFile/Photo/exif.t b/t/Asset/File/GalleryFile/Photo/exif.t
index 28cf54caa..79bfba469 100644
--- a/t/Asset/File/GalleryFile/Photo/exif.t
+++ b/t/Asset/File/GalleryFile/Photo/exif.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 ## The goal of this test is to test the EXIF functionality of WebGUI's photo
 # asset
diff --git a/t/Asset/File/GalleryFile/Photo/makeResolutions.t b/t/Asset/File/GalleryFile/Photo/makeResolutions.t
index a558677ed..5164a1853 100644
--- a/t/Asset/File/GalleryFile/Photo/makeResolutions.t
+++ b/t/Asset/File/GalleryFile/Photo/makeResolutions.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 ## The goal of this test is to test the creation of photo download 
 # resolutions
diff --git a/t/Asset/File/GalleryFile/Photo/makeShortcut.t b/t/Asset/File/GalleryFile/Photo/makeShortcut.t
index cfdd3ebe3..8fc81ba13 100644
--- a/t/Asset/File/GalleryFile/Photo/makeShortcut.t
+++ b/t/Asset/File/GalleryFile/Photo/makeShortcut.t
@@ -11,9 +11,7 @@
 # The goal of this test is to test the makeShortcut method and www_makeShortcut
 # pages
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 use Scalar::Util;
 use WebGUI::Test;
diff --git a/t/Asset/File/GalleryFile/Photo/navigation.t b/t/Asset/File/GalleryFile/Photo/navigation.t
index 468fcadb0..69e85be1e 100644
--- a/t/Asset/File/GalleryFile/Photo/navigation.t
+++ b/t/Asset/File/GalleryFile/Photo/navigation.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 ## The goal of this test is to test the creation and deletion of photo assets
 
diff --git a/t/Asset/File/GalleryFile/Photo/permissions.t b/t/Asset/File/GalleryFile/Photo/permissions.t
index 401c32012..215098c8a 100644
--- a/t/Asset/File/GalleryFile/Photo/permissions.t
+++ b/t/Asset/File/GalleryFile/Photo/permissions.t
@@ -10,9 +10,7 @@
 
 # Test permissions of Photo assets
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Asset/File/GalleryFile/Photo/rotate.t b/t/Asset/File/GalleryFile/Photo/rotate.t
index 9b20ac9b9..fec0bce9f 100644
--- a/t/Asset/File/GalleryFile/Photo/rotate.t
+++ b/t/Asset/File/GalleryFile/Photo/rotate.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 # The goal of this test is to confirm correct rotation of all files attached
 # to a Photo asset after calling the rotate method.
diff --git a/t/Asset/File/GalleryFile/Photo/setFile.t b/t/Asset/File/GalleryFile/Photo/setFile.t
index a45720b75..758df7e19 100644
--- a/t/Asset/File/GalleryFile/Photo/setFile.t
+++ b/t/Asset/File/GalleryFile/Photo/setFile.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 ## The goal of this test is to test the creation and deletion of photo assets
 
diff --git a/t/Asset/File/GalleryFile/Photo/view.t b/t/Asset/File/GalleryFile/Photo/view.t
index 772f01071..534ad3737 100644
--- a/t/Asset/File/GalleryFile/Photo/view.t
+++ b/t/Asset/File/GalleryFile/Photo/view.t
@@ -10,9 +10,7 @@
 
 # The goal of this test is to test the view and getTemplateVars methods
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../../lib";
 
 use WebGUI::Test;
 use WebGUI::HTML;
diff --git a/t/Asset/File/Image.t b/t/Asset/File/Image.t
index bb9e5d8e2..8cfcd5251 100644
--- a/t/Asset/File/Image.t
+++ b/t/Asset/File/Image.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use Test::MockObject;
 use Test::MockObject::Extends;
diff --git a/t/Asset/File/Image/setfile.t b/t/Asset/File/Image/setfile.t
index 50a2b82d0..a3c761709 100644
--- a/t/Asset/File/Image/setfile.t
+++ b/t/Asset/File/Image/setfile.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the additional functionality of the 
 # overridden setFile method
diff --git a/t/Asset/File/ZipArchive.t b/t/Asset/File/ZipArchive.t
index 76e6e31ca..0a6abc59d 100644
--- a/t/Asset/File/ZipArchive.t
+++ b/t/Asset/File/ZipArchive.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use WebGUI::Storage;
 use WebGUI::Asset;
diff --git a/t/Asset/File/setfile.t b/t/Asset/File/setfile.t
index 36a0d07ef..d212d2518 100644
--- a/t/Asset/File/setfile.t
+++ b/t/Asset/File/setfile.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ## The goal of this test is to test the creation and deletion of photo assets
 
diff --git a/t/Asset/JSONCollateral.t b/t/Asset/JSONCollateral.t
index a735c817a..5d5f1870f 100644
--- a/t/Asset/JSONCollateral.t
+++ b/t/Asset/JSONCollateral.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ################################################################
 #
diff --git a/t/Asset/MatrixListing.t b/t/Asset/MatrixListing.t
index dd4dd75c2..421118dfa 100644
--- a/t/Asset/MatrixListing.t
+++ b/t/Asset/MatrixListing.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to test the creation of a MatrixListing Asset.
 
diff --git a/t/Asset/Post.t b/t/Asset/Post.t
index 3aee28bce..e2d5edd87 100644
--- a/t/Asset/Post.t
+++ b/t/Asset/Post.t
@@ -14,9 +14,7 @@
 # 2. The tests for the features I've implemented; namely, functionality and
 # general access controls on who can edit a post.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use Test::More tests => 18; # increment this value for each test you create
diff --git a/t/Asset/Post/Thread.t b/t/Asset/Post/Thread.t
index be944216a..bfc0e84b6 100644
--- a/t/Asset/Post/Thread.t
+++ b/t/Asset/Post/Thread.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use Test::More tests => 15; # increment this value for each test you create
diff --git a/t/Asset/Post/Thread/getAdjacentThread.t b/t/Asset/Post/Thread/getAdjacentThread.t
index ed6d28cfd..17292d3a3 100644
--- a/t/Asset/Post/Thread/getAdjacentThread.t
+++ b/t/Asset/Post/Thread/getAdjacentThread.t
@@ -14,9 +14,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Post/Thread/permission.t b/t/Asset/Post/Thread/permission.t
index 376d0bd17..d1f1f8b7a 100644
--- a/t/Asset/Post/Thread/permission.t
+++ b/t/Asset/Post/Thread/permission.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Post/archiving.t b/t/Asset/Post/archiving.t
index ed4325ce1..193339370 100644
--- a/t/Asset/Post/archiving.t
+++ b/t/Asset/Post/archiving.t
@@ -11,9 +11,7 @@
 ## Test that archiving a post works, and checking side effects like updating
 ## lastPost information in the Thread, and CS.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use Test::More tests => 13; # increment this value for each test you create
diff --git a/t/Asset/Post/committing.t b/t/Asset/Post/committing.t
index 11084abdb..b9f98e363 100644
--- a/t/Asset/Post/committing.t
+++ b/t/Asset/Post/committing.t
@@ -10,9 +10,7 @@
 
 ## Test that committing a post works, and doesn't affect the parent thread.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Asset/Post/notification.t b/t/Asset/Post/notification.t
index 53276a33d..75a85968a 100644
--- a/t/Asset/Post/notification.t
+++ b/t/Asset/Post/notification.t
@@ -11,9 +11,7 @@
 ## Test that trashing a post works, and checking side effects like updating
 ## lastPost information in the Thread, and CS.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use Test::More tests => 9; # increment this value for each test you create
diff --git a/t/Asset/Post/permission.t b/t/Asset/Post/permission.t
index 895324d9c..7830f9773 100644
--- a/t/Asset/Post/permission.t
+++ b/t/Asset/Post/permission.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Post/trashing.t b/t/Asset/Post/trashing.t
index f45473a2b..1b2c13e8f 100644
--- a/t/Asset/Post/trashing.t
+++ b/t/Asset/Post/trashing.t
@@ -11,9 +11,7 @@
 ## Test that trashing a post works, and checking side effects like updating
 ## lastPost information in the Thread, and CS.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use Test::More tests => 13; # increment this value for each test you create
diff --git a/t/Asset/Redirect/mech.t b/t/Asset/Redirect/mech.t
index 875ed103c..8ce2a9bf6 100644
--- a/t/Asset/Redirect/mech.t
+++ b/t/Asset/Redirect/mech.t
@@ -13,9 +13,7 @@
 # asset.
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Asset;
diff --git a/t/Asset/Shortcut/000-create-delete.t b/t/Asset/Shortcut/000-create-delete.t
index 812924793..e53afbf13 100644
--- a/t/Asset/Shortcut/000-create-delete.t
+++ b/t/Asset/Shortcut/000-create-delete.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ## The goal of this test is to test the creation and deletion of shortcut assets
 
diff --git a/t/Asset/Shortcut/010-linked-asset.t b/t/Asset/Shortcut/010-linked-asset.t
index 223b4f8f1..c6663b9af 100644
--- a/t/Asset/Shortcut/010-linked-asset.t
+++ b/t/Asset/Shortcut/010-linked-asset.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ## The goal of this test is to test the link between the asset and its shortcut
 # and that changes to the asset are propagated to the shortcut
diff --git a/t/Asset/Sku.t b/t/Asset/Sku.t
index 8a906c1c2..a75083253 100644
--- a/t/Asset/Sku.t
+++ b/t/Asset/Sku.t
@@ -13,9 +13,7 @@
 #
 # This tests WebGUI::Asset::Sku, which is the base class for commerce items
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Sku/Ad.t b/t/Asset/Sku/Ad.t
index d6092ba45..8521db006 100644
--- a/t/Asset/Sku/Ad.t
+++ b/t/Asset/Sku/Ad.t
@@ -13,9 +13,7 @@
 #
 # This tests WebGUI::Asset::Sku::Ad
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use Test::More;
 use Test::Deep;
diff --git a/t/Asset/Sku/Donation.t b/t/Asset/Sku/Donation.t
index 20c3f0d14..20f8c3ff7 100644
--- a/t/Asset/Sku/Donation.t
+++ b/t/Asset/Sku/Donation.t
@@ -13,9 +13,7 @@
 #
 # This tests WebGUI::Asset::Sku::Donation
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Sku/Product.t b/t/Asset/Sku/Product.t
index e7978b31a..abee584a1 100644
--- a/t/Asset/Sku/Product.t
+++ b/t/Asset/Sku/Product.t
@@ -13,9 +13,7 @@
 #
 # This tests WebGUI::Asset::Sku::Product
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use Test::More;
 use Test::Deep;
diff --git a/t/Asset/Sku/ProductCollateral.t b/t/Asset/Sku/ProductCollateral.t
index a023721d2..22cf611c6 100644
--- a/t/Asset/Sku/ProductCollateral.t
+++ b/t/Asset/Sku/ProductCollateral.t
@@ -13,9 +13,7 @@
 #
 # This tests WebGUI::Asset::Sku::Donation
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use Test::More;
 use Test::Deep;
diff --git a/t/Asset/Sku/Subscription.t b/t/Asset/Sku/Subscription.t
index eb4502172..079231fa4 100644
--- a/t/Asset/Sku/Subscription.t
+++ b/t/Asset/Sku/Subscription.t
@@ -13,9 +13,7 @@
 #
 # This tests WebGUI::Asset::Sku::Donation
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Asset/Snippet.t b/t/Asset/Snippet.t
index 9071bbe4c..409678257 100644
--- a/t/Asset/Snippet.t
+++ b/t/Asset/Snippet.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to test the creation of Snippet Assets.
 
diff --git a/t/Asset/Story.t b/t/Asset/Story.t
index 44347a1a0..b00bd2a05 100644
--- a/t/Asset/Story.t
+++ b/t/Asset/Story.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Test::Maker::Permission;
diff --git a/t/Asset/Template.t b/t/Asset/Template.t
index 2c1866d9a..21471519e 100644
--- a/t/Asset/Template.t
+++ b/t/Asset/Template.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Asset/Template/HTMLTemplateExpr.t b/t/Asset/Template/HTMLTemplateExpr.t
index b8b31da3e..5d61550b8 100644
--- a/t/Asset/Template/HTMLTemplateExpr.t
+++ b/t/Asset/Template/HTMLTemplateExpr.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use HTML::TokeParser;
 
 use WebGUI::Test;
diff --git a/t/Asset/Template/packed.t b/t/Asset/Template/packed.t
index 86ed1a706..7d94192e7 100644
--- a/t/Asset/Template/packed.t
+++ b/t/Asset/Template/packed.t
@@ -14,9 +14,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/WikiPage.t b/t/Asset/WikiPage.t
index cf0e716f1..c71a7a3e9 100644
--- a/t/Asset/WikiPage.t
+++ b/t/Asset/WikiPage.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ##The goal of this test is to test the creation of a WikiPage Asset.
 
diff --git a/t/Asset/WikiPage/permissions.t b/t/Asset/WikiPage/permissions.t
index caa8c0b7c..447ccb537 100644
--- a/t/Asset/WikiPage/permissions.t
+++ b/t/Asset/WikiPage/permissions.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test permissions handling for the WikiMaster and WikiPage.
 
diff --git a/t/Asset/WikiPage/subscribable.t b/t/Asset/WikiPage/subscribable.t
index 7dbcff4f5..40417a320 100644
--- a/t/Asset/WikiPage/subscribable.t
+++ b/t/Asset/WikiPage/subscribable.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Wobject/Article.t b/t/Asset/Wobject/Article.t
index a81e5aca6..c9036a742 100644
--- a/t/Asset/Wobject/Article.t
+++ b/t/Asset/Wobject/Article.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use File::Spec;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test the creation of Article Wobjects.
 
diff --git a/t/Asset/Wobject/AssetReport.t b/t/Asset/Wobject/AssetReport.t
index 16379cfbb..2aa67fb77 100644
--- a/t/Asset/Wobject/AssetReport.t
+++ b/t/Asset/Wobject/AssetReport.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Asset/Wobject/Calendar.t b/t/Asset/Wobject/Calendar.t
index ae8aba715..4693455d2 100644
--- a/t/Asset/Wobject/Calendar.t
+++ b/t/Asset/Wobject/Calendar.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test the creation of Calendar Wobjects.
 
diff --git a/t/Asset/Wobject/Carousel.t b/t/Asset/Wobject/Carousel.t
index 8eb9f96b2..23043f908 100644
--- a/t/Asset/Wobject/Carousel.t
+++ b/t/Asset/Wobject/Carousel.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test the creation of Carousel Wobjects.
 
diff --git a/t/Asset/Wobject/Collaboration.t b/t/Asset/Wobject/Collaboration.t
index 49547fd43..bdf61158a 100644
--- a/t/Asset/Wobject/Collaboration.t
+++ b/t/Asset/Wobject/Collaboration.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::User;
diff --git a/t/Asset/Wobject/Collaboration/getThreads.t b/t/Asset/Wobject/Collaboration/getThreads.t
index c0556106c..c34cfcb1c 100644
--- a/t/Asset/Wobject/Collaboration/getThreads.t
+++ b/t/Asset/Wobject/Collaboration/getThreads.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Asset/Wobject/Collaboration/permission.t b/t/Asset/Wobject/Collaboration/permission.t
index 1eedc6819..39d8ca4b8 100644
--- a/t/Asset/Wobject/Collaboration/permission.t
+++ b/t/Asset/Wobject/Collaboration/permission.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Wobject/Collaboration/templateVariables.t b/t/Asset/Wobject/Collaboration/templateVariables.t
index 10ff8a086..53fdecc57 100644
--- a/t/Asset/Wobject/Collaboration/templateVariables.t
+++ b/t/Asset/Wobject/Collaboration/templateVariables.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use Test::More;
 use Test::Deep;
diff --git a/t/Asset/Wobject/Collaboration/unarchiveAll.t b/t/Asset/Wobject/Collaboration/unarchiveAll.t
index 643d27d82..f1a26e4f3 100644
--- a/t/Asset/Wobject/Collaboration/unarchiveAll.t
+++ b/t/Asset/Wobject/Collaboration/unarchiveAll.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Wobject/DataForm.t b/t/Asset/Wobject/DataForm.t
index 851e146a8..883ce84af 100644
--- a/t/Asset/Wobject/DataForm.t
+++ b/t/Asset/Wobject/DataForm.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Asset/Wobject/DataForm/addEntry.t b/t/Asset/Wobject/DataForm/addEntry.t
index 3238ce890..61f7d3076 100644
--- a/t/Asset/Wobject/DataForm/addEntry.t
+++ b/t/Asset/Wobject/DataForm/addEntry.t
@@ -13,9 +13,7 @@
 #
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test;    # Must use this before any other WebGUI modules
diff --git a/t/Asset/Wobject/DataForm/diagnose.t b/t/Asset/Wobject/DataForm/diagnose.t
index 43f6579ba..fcb044f7b 100644
--- a/t/Asset/Wobject/DataForm/diagnose.t
+++ b/t/Asset/Wobject/DataForm/diagnose.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ##The goal of this test is to diagnose problems in DataForms.
 ##  Orphaned DataForms with no Asset table entries
diff --git a/t/Asset/Wobject/DataForm/moveField.t b/t/Asset/Wobject/DataForm/moveField.t
index f81adf357..965b84670 100644
--- a/t/Asset/Wobject/DataForm/moveField.t
+++ b/t/Asset/Wobject/DataForm/moveField.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Asset/Wobject/DataForm/viewList.t b/t/Asset/Wobject/DataForm/viewList.t
index ef8d26055..22de6186b 100644
--- a/t/Asset/Wobject/DataForm/viewList.t
+++ b/t/Asset/Wobject/DataForm/viewList.t
@@ -13,9 +13,7 @@
 #
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test;    # Must use this before any other WebGUI modules
diff --git a/t/Asset/Wobject/DataTable.t b/t/Asset/Wobject/DataTable.t
index bf23b805b..9ee815e57 100644
--- a/t/Asset/Wobject/DataTable.t
+++ b/t/Asset/Wobject/DataTable.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Asset/Wobject/EventManagementSystem.t b/t/Asset/Wobject/EventManagementSystem.t
index d70cf9d35..7d69c0ec2 100644
--- a/t/Asset/Wobject/EventManagementSystem.t
+++ b/t/Asset/Wobject/EventManagementSystem.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Test::MockAsset;
diff --git a/t/Asset/Wobject/Gallery/00base.t b/t/Asset/Wobject/Gallery/00base.t
index 60f4d8c7f..4551c2675 100644
--- a/t/Asset/Wobject/Gallery/00base.t
+++ b/t/Asset/Wobject/Gallery/00base.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the creation and deletion of gallery assets
 
diff --git a/t/Asset/Wobject/Gallery/permission.t b/t/Asset/Wobject/Gallery/permission.t
index 0b167aa4f..fb1243f9d 100644
--- a/t/Asset/Wobject/Gallery/permission.t
+++ b/t/Asset/Wobject/Gallery/permission.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test permissions inside Gallerys
 
diff --git a/t/Asset/Wobject/Gallery/search.t b/t/Asset/Wobject/Gallery/search.t
index b17b0d7c1..3973c1588 100644
--- a/t/Asset/Wobject/Gallery/search.t
+++ b/t/Asset/Wobject/Gallery/search.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 # Test of the Gallery basic and advanced search. In non-live tests, the Gallery 
 # search is accessed via the "search" method. Form parameters are passed in via
diff --git a/t/Asset/Wobject/GalleryAlbum/00base.t b/t/Asset/Wobject/GalleryAlbum/00base.t
index d1b618cbf..084e8e011 100644
--- a/t/Asset/Wobject/GalleryAlbum/00base.t
+++ b/t/Asset/Wobject/GalleryAlbum/00base.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the creation and deletion of album assets
 
diff --git a/t/Asset/Wobject/GalleryAlbum/addArchive.t b/t/Asset/Wobject/GalleryAlbum/addArchive.t
index d3200705f..170c6c4fc 100644
--- a/t/Asset/Wobject/GalleryAlbum/addArchive.t
+++ b/t/Asset/Wobject/GalleryAlbum/addArchive.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the permissions of GalleryAlbum assets
 
diff --git a/t/Asset/Wobject/GalleryAlbum/ajax.t b/t/Asset/Wobject/GalleryAlbum/ajax.t
index 27a7380d6..d831e113a 100644
--- a/t/Asset/Wobject/GalleryAlbum/ajax.t
+++ b/t/Asset/Wobject/GalleryAlbum/ajax.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the creation and deletion of album assets
 
diff --git a/t/Asset/Wobject/GalleryAlbum/delete.t b/t/Asset/Wobject/GalleryAlbum/delete.t
index 86818cec8..76b8945b9 100644
--- a/t/Asset/Wobject/GalleryAlbum/delete.t
+++ b/t/Asset/Wobject/GalleryAlbum/delete.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the deleting of GalleryAlbums
 
diff --git a/t/Asset/Wobject/GalleryAlbum/edit.t b/t/Asset/Wobject/GalleryAlbum/edit.t
index e905dbde5..bcaf2c7ab 100644
--- a/t/Asset/Wobject/GalleryAlbum/edit.t
+++ b/t/Asset/Wobject/GalleryAlbum/edit.t
@@ -14,9 +14,7 @@
 # - users can add albums.
 # - photos can be rotated.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/Wobject/GalleryAlbum/navigation.t b/t/Asset/Wobject/GalleryAlbum/navigation.t
index b2e4866d3..b18d5d629 100644
--- a/t/Asset/Wobject/GalleryAlbum/navigation.t
+++ b/t/Asset/Wobject/GalleryAlbum/navigation.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the creation and deletion of album assets
 
diff --git a/t/Asset/Wobject/GalleryAlbum/permission.t b/t/Asset/Wobject/GalleryAlbum/permission.t
index 5b05ca872..876cd3f7a 100644
--- a/t/Asset/Wobject/GalleryAlbum/permission.t
+++ b/t/Asset/Wobject/GalleryAlbum/permission.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the permissions of GalleryAlbum assets
 
diff --git a/t/Asset/Wobject/GalleryAlbum/rss.t b/t/Asset/Wobject/GalleryAlbum/rss.t
index 989eaacba..513786d30 100644
--- a/t/Asset/Wobject/GalleryAlbum/rss.t
+++ b/t/Asset/Wobject/GalleryAlbum/rss.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the rss view of GalleryAlbums
 
diff --git a/t/Asset/Wobject/GalleryAlbum/slideshow.t b/t/Asset/Wobject/GalleryAlbum/slideshow.t
index cee4baba5..b5e47ec03 100644
--- a/t/Asset/Wobject/GalleryAlbum/slideshow.t
+++ b/t/Asset/Wobject/GalleryAlbum/slideshow.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the slideshow view of GalleryAlbums
 
diff --git a/t/Asset/Wobject/GalleryAlbum/thumbnails.t b/t/Asset/Wobject/GalleryAlbum/thumbnails.t
index 4a345662b..1201b4bfc 100644
--- a/t/Asset/Wobject/GalleryAlbum/thumbnails.t
+++ b/t/Asset/Wobject/GalleryAlbum/thumbnails.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the thumbnails view of GalleryAlbums
 
diff --git a/t/Asset/Wobject/GalleryAlbum/view.t b/t/Asset/Wobject/GalleryAlbum/view.t
index 3e3115a20..fee9edfd8 100644
--- a/t/Asset/Wobject/GalleryAlbum/view.t
+++ b/t/Asset/Wobject/GalleryAlbum/view.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 
 ## The goal of this test is to test the default view and associated subs
 
diff --git a/t/Asset/Wobject/InOutBoard.t b/t/Asset/Wobject/InOutBoard.t
index 3cc7abd0b..944436d6e 100644
--- a/t/Asset/Wobject/InOutBoard.t
+++ b/t/Asset/Wobject/InOutBoard.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::MockObject;
 use Test::MockObject::Extends;
 
diff --git a/t/Asset/Wobject/Matrix.t b/t/Asset/Wobject/Matrix.t
index c4d1a5337..a4b13edee 100644
--- a/t/Asset/Wobject/Matrix.t
+++ b/t/Asset/Wobject/Matrix.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use File::Spec;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test the creation of UserList Wobjects.
 
diff --git a/t/Asset/Wobject/Poll.t b/t/Asset/Wobject/Poll.t
index 9e622fc02..64db3ad8b 100644
--- a/t/Asset/Wobject/Poll.t
+++ b/t/Asset/Wobject/Poll.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Asset/Wobject/SQLReport.t b/t/Asset/Wobject/SQLReport.t
index d42dcad2a..7ed7d8169 100644
--- a/t/Asset/Wobject/SQLReport.t
+++ b/t/Asset/Wobject/SQLReport.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Asset/Wobject/Search.t b/t/Asset/Wobject/Search.t
index b09fd2ba8..f91a011a1 100644
--- a/t/Asset/Wobject/Search.t
+++ b/t/Asset/Wobject/Search.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test the creation of Search Wobjects.
 
diff --git a/t/Asset/Wobject/Search/searchroot.t b/t/Asset/Wobject/Search/searchroot.t
index 0a4512ebe..37e9af7bc 100644
--- a/t/Asset/Wobject/Search/searchroot.t
+++ b/t/Asset/Wobject/Search/searchroot.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use JSON qw/from_json/;
-use lib "$FindBin::Bin/../../../lib";
 
 ##The goal of this test is to test the creation of Search Wobjects.
 
diff --git a/t/Asset/Wobject/Shelf.t b/t/Asset/Wobject/Shelf.t
index 8cc5df7ee..64fbd17da 100644
--- a/t/Asset/Wobject/Shelf.t
+++ b/t/Asset/Wobject/Shelf.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Exception::Class;
diff --git a/t/Asset/Wobject/StoryArchive.t b/t/Asset/Wobject/StoryArchive.t
index 1ea8053e2..a76bcdb02 100644
--- a/t/Asset/Wobject/StoryArchive.t
+++ b/t/Asset/Wobject/StoryArchive.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use File::Copy qw/mv/;
diff --git a/t/Asset/Wobject/StoryTopic.t b/t/Asset/Wobject/StoryTopic.t
index 792dce1e7..e88aaf749 100644
--- a/t/Asset/Wobject/StoryTopic.t
+++ b/t/Asset/Wobject/StoryTopic.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Asset/Wobject/Survey.t b/t/Asset/Wobject/Survey.t
index 5d6c50fc4..ee63b1abc 100644
--- a/t/Asset/Wobject/Survey.t
+++ b/t/Asset/Wobject/Survey.t
@@ -4,8 +4,6 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Asset/Wobject/Survey/ExpressionEngine.t b/t/Asset/Wobject/Survey/ExpressionEngine.t
index 9f9a08f0e..46c4e6a72 100644
--- a/t/Asset/Wobject/Survey/ExpressionEngine.t
+++ b/t/Asset/Wobject/Survey/ExpressionEngine.t
@@ -4,8 +4,6 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use Test::MockObject::Extends;
diff --git a/t/Asset/Wobject/Survey/Reports.t b/t/Asset/Wobject/Survey/Reports.t
index 04a357006..5bb08629c 100644
--- a/t/Asset/Wobject/Survey/Reports.t
+++ b/t/Asset/Wobject/Survey/Reports.t
@@ -4,8 +4,6 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Asset/Wobject/Survey/ResponseJSON.t b/t/Asset/Wobject/Survey/ResponseJSON.t
index 1b40ea0df..843681d5c 100644
--- a/t/Asset/Wobject/Survey/ResponseJSON.t
+++ b/t/Asset/Wobject/Survey/ResponseJSON.t
@@ -4,8 +4,6 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use Test::MockObject::Extends;
diff --git a/t/Asset/Wobject/Survey/SurveyJSON.t b/t/Asset/Wobject/Survey/SurveyJSON.t
index 4830b4c25..d4bb12a93 100644
--- a/t/Asset/Wobject/Survey/SurveyJSON.t
+++ b/t/Asset/Wobject/Survey/SurveyJSON.t
@@ -4,8 +4,6 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use Test::Exception;
diff --git a/t/Asset/Wobject/Survey/Test.t b/t/Asset/Wobject/Survey/Test.t
index 055c15a33..e420a303c 100644
--- a/t/Asset/Wobject/Survey/Test.t
+++ b/t/Asset/Wobject/Survey/Test.t
@@ -4,8 +4,6 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use Test::Exception;
diff --git a/t/Asset/Wobject/SyndicatedContent.t b/t/Asset/Wobject/SyndicatedContent.t
index 21102f8d8..7e7f74435 100644
--- a/t/Asset/Wobject/SyndicatedContent.t
+++ b/t/Asset/Wobject/SyndicatedContent.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use File::Spec;
-use lib "$FindBin::Bin/../../lib";
 
 use Data::Dumper;
 
diff --git a/t/Asset/Wobject/SyndicatedContent/encodings.t b/t/Asset/Wobject/SyndicatedContent/encodings.t
index 29804f44e..d94daeb1d 100644
--- a/t/Asset/Wobject/SyndicatedContent/encodings.t
+++ b/t/Asset/Wobject/SyndicatedContent/encodings.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use File::Spec;
-use lib "$FindBin::Bin/../../../lib";
 
 # The goal of this test is to test the creation of 
 # and expose any bugs of SyndicatedContent Wobjects.
diff --git a/t/Asset/Wobject/Thingy.t b/t/Asset/Wobject/Thingy.t
index 704dae16c..a0f91be1b 100644
--- a/t/Asset/Wobject/Thingy.t
+++ b/t/Asset/Wobject/Thingy.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test the creation of Thingy Wobjects.
 
diff --git a/t/Asset/Wobject/UserList.t b/t/Asset/Wobject/UserList.t
index 8646bca06..472bdc7c8 100644
--- a/t/Asset/Wobject/UserList.t
+++ b/t/Asset/Wobject/UserList.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use File::Spec;
-use lib "$FindBin::Bin/../../lib";
 
 ##The goal of this test is to test the creation of UserList Wobjects.
 
diff --git a/t/Asset/Wobject/WikiMaster.t b/t/Asset/Wobject/WikiMaster.t
index 6fef63f59..ece7e6b85 100644
--- a/t/Asset/Wobject/WikiMaster.t
+++ b/t/Asset/Wobject/WikiMaster.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Differences;
 use Test::Deep;
diff --git a/t/Asset/Wobject/WikiMaster/featured.t b/t/Asset/Wobject/WikiMaster/featured.t
index 952125e02..41afce99a 100644
--- a/t/Asset/Wobject/WikiMaster/featured.t
+++ b/t/Asset/Wobject/WikiMaster/featured.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Asset/Wobject/WikiMaster/subscribable.t b/t/Asset/Wobject/WikiMaster/subscribable.t
index 6a385f448..de2439662 100644
--- a/t/Asset/Wobject/WikiMaster/subscribable.t
+++ b/t/Asset/Wobject/WikiMaster/subscribable.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/dispatch.t b/t/Asset/dispatch.t
index cc2e0a5c4..1bcebf8f1 100644
--- a/t/Asset/dispatch.t
+++ b/t/Asset/dispatch.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Asset/permissions.t b/t/Asset/permissions.t
index ff42ef518..883542875 100644
--- a/t/Asset/permissions.t
+++ b/t/Asset/permissions.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Test::Maker::Permission;
diff --git a/t/AssetAspect/RssFeed.t b/t/AssetAspect/RssFeed.t
index b869e8446..c8de2f8b8 100644
--- a/t/AssetAspect/RssFeed.t
+++ b/t/AssetAspect/RssFeed.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use File::Path;
diff --git a/t/AssetHelper/Copy.t b/t/AssetHelper/Copy.t
index df52d9b32..a5831f1db 100644
--- a/t/AssetHelper/Copy.t
+++ b/t/AssetHelper/Copy.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/AssetHelper/Copy/WithChildren.t b/t/AssetHelper/Copy/WithChildren.t
index 72f1d554b..16bded1d0 100644
--- a/t/AssetHelper/Copy/WithChildren.t
+++ b/t/AssetHelper/Copy/WithChildren.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/AssetHelper/Copy/WithDescendants.t b/t/AssetHelper/Copy/WithDescendants.t
index 1ddde5666..ff70aaf28 100644
--- a/t/AssetHelper/Copy/WithDescendants.t
+++ b/t/AssetHelper/Copy/WithDescendants.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/AssetHelper/Cut.t b/t/AssetHelper/Cut.t
index dfb75ae4d..251c563e5 100644
--- a/t/AssetHelper/Cut.t
+++ b/t/AssetHelper/Cut.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/AssetHelper/Demote.t b/t/AssetHelper/Demote.t
index e56da6a41..65a1efeea 100644
--- a/t/AssetHelper/Demote.t
+++ b/t/AssetHelper/Demote.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/AssetHelper/Lock.t b/t/AssetHelper/Lock.t
index 0d0145ca0..bf038d456 100644
--- a/t/AssetHelper/Lock.t
+++ b/t/AssetHelper/Lock.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/AssetHelper/Manage.t b/t/AssetHelper/Manage.t
index 86d5e96fc..7ce916876 100644
--- a/t/AssetHelper/Manage.t
+++ b/t/AssetHelper/Manage.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/AssetHelper/Promote.t b/t/AssetHelper/Promote.t
index 640b3f4c2..7a2c98567 100644
--- a/t/AssetHelper/Promote.t
+++ b/t/AssetHelper/Promote.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Auth.t b/t/Auth.t
index 001e00016..6c42b0a0d 100644
--- a/t/Auth.t
+++ b/t/Auth.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Auth;
diff --git a/t/Auth/LDAP.t b/t/Auth/LDAP.t
index 39bf8a19c..095282a41 100644
--- a/t/Auth/LDAP.t
+++ b/t/Auth/LDAP.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Auth/Twitter.t b/t/Auth/Twitter.t
index c9dea6f49..9ed95e582 100644
--- a/t/Auth/Twitter.t
+++ b/t/Auth/Twitter.t
@@ -13,9 +13,7 @@
 #
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Auth/mech.t b/t/Auth/mech.t
index 308fa9b29..f0398913e 100644
--- a/t/Auth/mech.t
+++ b/t/Auth/mech.t
@@ -18,9 +18,7 @@
 #   unauthorized page
 # returnUrl: tests use returnUrl= to try to return to the right place
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Asset;
diff --git a/t/Config.t b/t/Config.t
index 8ab3b7e4a..97ea5164c 100644
--- a/t/Config.t
+++ b/t/Config.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use Test::More tests => 14; # increment this value for each test you create
diff --git a/t/Content/Asset.t b/t/Content/Asset.t
index 3d3fa1ce3..91b724ce1 100644
--- a/t/Content/Asset.t
+++ b/t/Content/Asset.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Content/Maintenance.t b/t/Content/Maintenance.t
index 49e6b41d0..1b38fbce3 100644
--- a/t/Content/Maintenance.t
+++ b/t/Content/Maintenance.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Content::Maintenance;
diff --git a/t/Content/SetLanguage.t b/t/Content/SetLanguage.t
index 20f6978fd..6883223ad 100644
--- a/t/Content/SetLanguage.t
+++ b/t/Content/SetLanguage.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Content::SetLanguage;
diff --git a/t/Content/Setup.t b/t/Content/Setup.t
index 18e51e217..b86850216 100644
--- a/t/Content/Setup.t
+++ b/t/Content/Setup.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Content::Setup;
diff --git a/t/Content/SiteIndex.t b/t/Content/SiteIndex.t
index 587c05f13..463cab988 100644
--- a/t/Content/SiteIndex.t
+++ b/t/Content/SiteIndex.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Content::SiteIndex;
diff --git a/t/Content/Wizard.t b/t/Content/Wizard.t
index 1b654810b..57e7a0e7b 100644
--- a/t/Content/Wizard.t
+++ b/t/Content/Wizard.t
@@ -13,9 +13,7 @@
 #
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Crud.t b/t/Crud.t
index 9d70967e8..2e34280ac 100644
--- a/t/Crud.t
+++ b/t/Crud.t
@@ -12,9 +12,7 @@
 # Tests WebGUI::Crud
 
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Crud/Subclass.t b/t/Crud/Subclass.t
index c54bccf1c..afdf8c148 100644
--- a/t/Crud/Subclass.t
+++ b/t/Crud/Subclass.t
@@ -10,9 +10,7 @@
 #------------------------------------------------------------------
 
 # Tests a subclass of WebGUI::Crud
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::SubClass;
diff --git a/t/Crud/serialize.t b/t/Crud/serialize.t
index 36e2b1121..995b35d9c 100644
--- a/t/Crud/serialize.t
+++ b/t/Crud/serialize.t
@@ -12,9 +12,7 @@
 # Tests WebGUI::Crud
 
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/DatabaseLink.t b/t/DatabaseLink.t
index c1986b66d..02429e4a8 100644
--- a/t/DatabaseLink.t
+++ b/t/DatabaseLink.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/DateTime.t b/t/DateTime.t
index 48026b902..ee824df12 100644
--- a/t/DateTime.t
+++ b/t/DateTime.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::User;
diff --git a/t/Definition.t b/t/Definition.t
index 504c32d76..c6b57960f 100644
--- a/t/Definition.t
+++ b/t/Definition.t
@@ -8,11 +8,9 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
 no warnings qw(uninitialized);
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 
diff --git a/t/Definition/Asset.t b/t/Definition/Asset.t
index 6abcf9645..9a8d1e495 100644
--- a/t/Definition/Asset.t
+++ b/t/Definition/Asset.t
@@ -12,8 +12,6 @@ use strict;
 use warnings;
 no warnings qw(uninitialized);
 
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 
 use Test::More;
 use Test::Deep;
diff --git a/t/Exception/Shop.t b/t/Exception/Shop.t
index 4fb6fe1e4..8a85746bf 100644
--- a/t/Exception/Shop.t
+++ b/t/Exception/Shop.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Exception/app.t b/t/Exception/app.t
index d43bbd7c3..a3c963969 100644
--- a/t/Exception/app.t
+++ b/t/Exception/app.t
@@ -1,7 +1,5 @@
 # Test what happens when the WebGUI PSGI app throws exceptions
 use strict;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use WebGUI;
 use WebGUI::Test;
 use Plack::Test;
diff --git a/t/FilePump/Bundle.t b/t/FilePump/Bundle.t
index 5aa9d4c20..28e32145d 100644
--- a/t/FilePump/Bundle.t
+++ b/t/FilePump/Bundle.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Test::Exception;
diff --git a/t/Form.t b/t/Form.t
index 4d0848bbe..ccab96341 100644
--- a/t/Form.t
+++ b/t/Form.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test;
diff --git a/t/Form/AssetReportQuery.t b/t/Form/AssetReportQuery.t
index b5b2523c7..c1e8000a8 100644
--- a/t/Form/AssetReportQuery.t
+++ b/t/Form/AssetReportQuery.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/ButtonGroup.t b/t/Form/ButtonGroup.t
index 960a29daf..162a0dde2 100644
--- a/t/Form/ButtonGroup.t
+++ b/t/Form/ButtonGroup.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Form/CheckList.t b/t/Form/CheckList.t
index 5b502ea4a..2a7219771 100644
--- a/t/Form/CheckList.t
+++ b/t/Form/CheckList.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use Tie::IxHash;
 
diff --git a/t/Form/Checkbox.t b/t/Form/Checkbox.t
index e2c19d052..cf236a5b0 100644
--- a/t/Form/Checkbox.t
+++ b/t/Form/Checkbox.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/ClassName.t b/t/Form/ClassName.t
index 82c317951..e5d24d2cb 100644
--- a/t/Form/ClassName.t
+++ b/t/Form/ClassName.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/CsrfToken.t b/t/Form/CsrfToken.t
index 4d67d108a..09143008e 100644
--- a/t/Form/CsrfToken.t
+++ b/t/Form/CsrfToken.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/DataTable.t b/t/Form/DataTable.t
index df0bf63ec..7ba46393f 100644
--- a/t/Form/DataTable.t
+++ b/t/Form/DataTable.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Form/Date.t b/t/Form/Date.t
index 93f6056aa..da50b9202 100644
--- a/t/Form/Date.t
+++ b/t/Form/Date.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/DateTime.t b/t/Form/DateTime.t
index 3504fa3b0..9d6f26e65 100644
--- a/t/Form/DateTime.t
+++ b/t/Form/DateTime.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/Div.t b/t/Form/Div.t
index a31f2249b..81d014998 100644
--- a/t/Form/Div.t
+++ b/t/Form/Div.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/DynamicField.t b/t/Form/DynamicField.t
index bb772f8c4..663bdd23b 100644
--- a/t/Form/DynamicField.t
+++ b/t/Form/DynamicField.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/Email.t b/t/Form/Email.t
index 0775bb715..71f1c76e9 100644
--- a/t/Form/Email.t
+++ b/t/Form/Email.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/Float.t b/t/Form/Float.t
index b6db2dcfb..a34c9efbb 100644
--- a/t/Form/Float.t
+++ b/t/Form/Float.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/GetName.t b/t/Form/GetName.t
index 03035b14c..b7967b167 100644
--- a/t/Form/GetName.t
+++ b/t/Form/GetName.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form::FieldType;
diff --git a/t/Form/Hidden.t b/t/Form/Hidden.t
index 7675cabd2..ef1f49fab 100644
--- a/t/Form/Hidden.t
+++ b/t/Form/Hidden.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/Integer.t b/t/Form/Integer.t
index f563c7403..b01b4f254 100644
--- a/t/Form/Integer.t
+++ b/t/Form/Integer.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/ListEquiv.t b/t/Form/ListEquiv.t
index 1713e8a6c..f2ba808db 100644
--- a/t/Form/ListEquiv.t
+++ b/t/Form/ListEquiv.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form::DynamicField;
diff --git a/t/Form/Password.t b/t/Form/Password.t
index 298770d6b..e0ee746f5 100644
--- a/t/Form/Password.t
+++ b/t/Form/Password.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/Phone.t b/t/Form/Phone.t
index cc118f8a9..350ef2a87 100644
--- a/t/Form/Phone.t
+++ b/t/Form/Phone.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/ProfileEnabled.t b/t/Form/ProfileEnabled.t
index e21a0c757..abe770e10 100644
--- a/t/Form/ProfileEnabled.t
+++ b/t/Form/ProfileEnabled.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form::FieldType;
diff --git a/t/Form/Radio.t b/t/Form/Radio.t
index 22e80b8f0..ece16a889 100644
--- a/t/Form/Radio.t
+++ b/t/Form/Radio.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/SelectBox.t b/t/Form/SelectBox.t
index 573c1b97a..9a7316ad4 100644
--- a/t/Form/SelectBox.t
+++ b/t/Form/SelectBox.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/SelectList.t b/t/Form/SelectList.t
index 1303cfacc..fc4430059 100644
--- a/t/Form/SelectList.t
+++ b/t/Form/SelectList.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/SelectRichEditor.t b/t/Form/SelectRichEditor.t
index d9f4e808d..b9babc825 100644
--- a/t/Form/SelectRichEditor.t
+++ b/t/Form/SelectRichEditor.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 ## The goal of this test is to test the SelectRichEditor form control
 
diff --git a/t/Form/Template.t b/t/Form/Template.t
index a5729ff98..7b81be0e6 100644
--- a/t/Form/Template.t
+++ b/t/Form/Template.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form::Template;
diff --git a/t/Form/Text.t b/t/Form/Text.t
index 7b4830654..fa9dc3a03 100644
--- a/t/Form/Text.t
+++ b/t/Form/Text.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/Textarea.t b/t/Form/Textarea.t
index 8f4009e69..8f0456c45 100644
--- a/t/Form/Textarea.t
+++ b/t/Form/Textarea.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/TimeZone.t b/t/Form/TimeZone.t
index 470ea2b2b..90acc709c 100644
--- a/t/Form/TimeZone.t
+++ b/t/Form/TimeZone.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form::TimeZone;
diff --git a/t/Form/Url.t b/t/Form/Url.t
index fc3319406..72ce35b9c 100644
--- a/t/Form/Url.t
+++ b/t/Form/Url.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/Form/Zipcode.t b/t/Form/Zipcode.t
index 028b2f53a..2e6d06500 100644
--- a/t/Form/Zipcode.t
+++ b/t/Form/Zipcode.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Form;
diff --git a/t/FormBuilder.t b/t/FormBuilder.t
index 1279ecb21..f952cff64 100644
--- a/t/FormBuilder.t
+++ b/t/FormBuilder.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/FormBuilder/Tab.t b/t/FormBuilder/Tab.t
index 44a6a65da..dbf8234c6 100644
--- a/t/FormBuilder/Tab.t
+++ b/t/FormBuilder/Tab.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Group.t b/t/Group.t
index ea1fb2fb0..7929b7eda 100644
--- a/t/Group.t
+++ b/t/Group.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Group/resetGroupFields.t b/t/Group/resetGroupFields.t
index 0b91d2123..0fb80824d 100644
--- a/t/Group/resetGroupFields.t
+++ b/t/Group/resetGroupFields.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/HTML.t b/t/HTML.t
index 66800b9ba..bd1381f39 100644
--- a/t/HTML.t
+++ b/t/HTML.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::HTML;
diff --git a/t/HTML/addToRow.t b/t/HTML/addToRow.t
index 6384a02e4..5beed6392 100644
--- a/t/HTML/addToRow.t
+++ b/t/HTML/addToRow.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::HTML;
diff --git a/t/HTML/splitSeparator.t b/t/HTML/splitSeparator.t
index c0ae59cc1..470b58b89 100644
--- a/t/HTML/splitSeparator.t
+++ b/t/HTML/splitSeparator.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::HTML;
diff --git a/t/HTML/splitTag.t b/t/HTML/splitTag.t
index 9bd2aec21..90af24e90 100644
--- a/t/HTML/splitTag.t
+++ b/t/HTML/splitTag.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::HTML;
diff --git a/t/Help/compiled.t b/t/Help/compiled.t
index 3ee3d4d72..9f4211fe2 100644
--- a/t/Help/compiled.t
+++ b/t/Help/compiled.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Help/isa.t b/t/Help/isa.t
index 48f1b82a9..588d2e584 100644
--- a/t/Help/isa.t
+++ b/t/Help/isa.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Help/related.t b/t/Help/related.t
index b3c31e2f4..3355f8d41 100644
--- a/t/Help/related.t
+++ b/t/Help/related.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Inbox.t b/t/Inbox.t
index ea7989b29..bf5b2b636 100644
--- a/t/Inbox.t
+++ b/t/Inbox.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 
diff --git a/t/Inbox/Groups.t b/t/Inbox/Groups.t
index 1cc748fa5..06dbab2d1 100644
--- a/t/Inbox/Groups.t
+++ b/t/Inbox/Groups.t
@@ -13,8 +13,6 @@
 use strict;
 use warnings;
 
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Inbox/Message.t b/t/Inbox/Message.t
index 20ad3774b..3f9c82bc3 100644
--- a/t/Inbox/Message.t
+++ b/t/Inbox/Message.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/International.t b/t/International.t
index 71676d68a..2f070642a 100644
--- a/t/International.t
+++ b/t/International.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use Test::More; # increment this value for each test you create
diff --git a/t/Keyword.t b/t/Keyword.t
index 365ef7a76..6a9edc043 100644
--- a/t/Keyword.t
+++ b/t/Keyword.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Keyword;
diff --git a/t/LDAPLink.t b/t/LDAPLink.t
index bc243002d..b9b8af722 100644
--- a/t/LDAPLink.t
+++ b/t/LDAPLink.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Macro.t b/t/Macro.t
index 3a4eaa8f7..106d8d806 100644
--- a/t/Macro.t
+++ b/t/Macro.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/AOIHits.t b/t/Macro/AOIHits.t
index cdd059a2b..b555b4e54 100644
--- a/t/Macro/AOIHits.t
+++ b/t/Macro/AOIHits.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/AOIRank.t b/t/Macro/AOIRank.t
index 901ba287f..41c9d1382 100644
--- a/t/Macro/AOIRank.t
+++ b/t/Macro/AOIRank.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/AdSpace.t b/t/Macro/AdSpace.t
index 0699e3889..ab25f6317 100644
--- a/t/Macro/AdSpace.t
+++ b/t/Macro/AdSpace.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/AdminBar.t b/t/Macro/AdminBar.t
index 9f82f421f..0fe5dc525 100644
--- a/t/Macro/AdminBar.t
+++ b/t/Macro/AdminBar.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/AdminText.t b/t/Macro/AdminText.t
index e3616ccdb..2a1ffb457 100644
--- a/t/Macro/AdminText.t
+++ b/t/Macro/AdminText.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/AdminToggle.t b/t/Macro/AdminToggle.t
index 30064550a..35f39513f 100644
--- a/t/Macro/AdminToggle.t
+++ b/t/Macro/AdminToggle.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/AssetProxy.t b/t/Macro/AssetProxy.t
index 95f99752e..1eac47bc1 100644
--- a/t/Macro/AssetProxy.t
+++ b/t/Macro/AssetProxy.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/At_username.t b/t/Macro/At_username.t
index cb81b9cad..8da8bab3a 100644
--- a/t/Macro/At_username.t
+++ b/t/Macro/At_username.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/BackToSite.t b/t/Macro/BackToSite.t
index 1ecb46887..d078bf70d 100644
--- a/t/Macro/BackToSite.t
+++ b/t/Macro/BackToSite.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::BackToSite;
diff --git a/t/Macro/CanEditText.t b/t/Macro/CanEditText.t
index e1807e8da..8fb7d0ce7 100644
--- a/t/Macro/CanEditText.t
+++ b/t/Macro/CanEditText.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/CartItemCount.t b/t/Macro/CartItemCount.t
index b2482c484..84c739d86 100644
--- a/t/Macro/CartItemCount.t
+++ b/t/Macro/CartItemCount.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/ConvertUTCToTZ.t b/t/Macro/ConvertUTCToTZ.t
index e126885a0..803d672d0 100644
--- a/t/Macro/ConvertUTCToTZ.t
+++ b/t/Macro/ConvertUTCToTZ.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/D_date.t b/t/Macro/D_date.t
index 7eb07cc94..fa7e4c1ca 100644
--- a/t/Macro/D_date.t
+++ b/t/Macro/D_date.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/DeactivateAccount.t b/t/Macro/DeactivateAccount.t
index f7dfc6eca..a3e52b0f2 100644
--- a/t/Macro/DeactivateAccount.t
+++ b/t/Macro/DeactivateAccount.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/EditableToggle.t b/t/Macro/EditableToggle.t
index c990bea52..8366b028b 100644
--- a/t/Macro/EditableToggle.t
+++ b/t/Macro/EditableToggle.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Env.t b/t/Macro/Env.t
index 237fed212..4088c95be 100644
--- a/t/Macro/Env.t
+++ b/t/Macro/Env.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Execute.t b/t/Macro/Execute.t
index 6fb513a4b..5321ccfe2 100644
--- a/t/Macro/Execute.t
+++ b/t/Macro/Execute.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Extras.t b/t/Macro/Extras.t
index 7bfeccfcd..445ea4ec1 100644
--- a/t/Macro/Extras.t
+++ b/t/Macro/Extras.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/FetchMimeType.t b/t/Macro/FetchMimeType.t
index 6c49834ff..7d8264843 100644
--- a/t/Macro/FetchMimeType.t
+++ b/t/Macro/FetchMimeType.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/FilePump.t b/t/Macro/FilePump.t
index 14c04f11e..54ab47521 100644
--- a/t/Macro/FilePump.t
+++ b/t/Macro/FilePump.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Macro/FileUrl.t b/t/Macro/FileUrl.t
index ac3dced78..96bbb7867 100644
--- a/t/Macro/FileUrl.t
+++ b/t/Macro/FileUrl.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/FormParam.t b/t/Macro/FormParam.t
index 458c3851f..4ca352b8d 100644
--- a/t/Macro/FormParam.t
+++ b/t/Macro/FormParam.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/GroupAdd.t b/t/Macro/GroupAdd.t
index 8e9bcd6c8..6756765e3 100644
--- a/t/Macro/GroupAdd.t
+++ b/t/Macro/GroupAdd.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/GroupDelete.t b/t/Macro/GroupDelete.t
index eb3803a80..211acee18 100644
--- a/t/Macro/GroupDelete.t
+++ b/t/Macro/GroupDelete.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/GroupText.t b/t/Macro/GroupText.t
index f8c9595f9..02ecdf0a6 100644
--- a/t/Macro/GroupText.t
+++ b/t/Macro/GroupText.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/H_homeLink.t b/t/Macro/H_homeLink.t
index 6aad1723e..d9df593e1 100644
--- a/t/Macro/H_homeLink.t
+++ b/t/Macro/H_homeLink.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Hash_userId.t b/t/Macro/Hash_userId.t
index cd2f2fca9..2cead0cfc 100644
--- a/t/Macro/Hash_userId.t
+++ b/t/Macro/Hash_userId.t
@@ -10,9 +10,7 @@
 
 ##The goal of this test is to make sure the Hash_userId macro works.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/If.t b/t/Macro/If.t
index fe2e929d4..4e4ae61eb 100644
--- a/t/Macro/If.t
+++ b/t/Macro/If.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Include.t b/t/Macro/Include.t
index 53d1b0890..4c5850d8c 100644
--- a/t/Macro/Include.t
+++ b/t/Macro/Include.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Paths;
diff --git a/t/Macro/International.t b/t/Macro/International.t
index ae4033da5..a5591ef00 100644
--- a/t/Macro/International.t
+++ b/t/Macro/International.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/L_loginBox.t b/t/Macro/L_loginBox.t
index 43eb67524..8c606c5e8 100644
--- a/t/Macro/L_loginBox.t
+++ b/t/Macro/L_loginBox.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/LastModified.t b/t/Macro/LastModified.t
index 5907bae34..a4b93f139 100644
--- a/t/Macro/LastModified.t
+++ b/t/Macro/LastModified.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/LoginToggle.t b/t/Macro/LoginToggle.t
index c5940941a..2aaf19972 100644
--- a/t/Macro/LoginToggle.t
+++ b/t/Macro/LoginToggle.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/MiniCart.t b/t/Macro/MiniCart.t
index 02f723784..414972344 100644
--- a/t/Macro/MiniCart.t
+++ b/t/Macro/MiniCart.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/NewMail.t b/t/Macro/NewMail.t
index e7f53ab9c..08a29023f 100644
--- a/t/Macro/NewMail.t
+++ b/t/Macro/NewMail.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Page.t b/t/Macro/Page.t
index 6d063586a..97bd7ef13 100644
--- a/t/Macro/Page.t
+++ b/t/Macro/Page.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/PageTitle.t b/t/Macro/PageTitle.t
index 0c9f7ebca..b6cb857d9 100644
--- a/t/Macro/PageTitle.t
+++ b/t/Macro/PageTitle.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/PageUrl.t b/t/Macro/PageUrl.t
index 97d9cb4df..7bfcbc504 100644
--- a/t/Macro/PageUrl.t
+++ b/t/Macro/PageUrl.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/PickLanguage.t b/t/Macro/PickLanguage.t
index fc9531943..b1b84d27a 100644
--- a/t/Macro/PickLanguage.t
+++ b/t/Macro/PickLanguage.t
@@ -7,9 +7,7 @@
 #-------------------------------------------------------------------
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
  
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Quote.t b/t/Macro/Quote.t
index c05026b52..6eae51184 100644
--- a/t/Macro/Quote.t
+++ b/t/Macro/Quote.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::Quote;
diff --git a/t/Macro/RandomAssetProxy.t b/t/Macro/RandomAssetProxy.t
index b56da64eb..6eb89b90e 100644
--- a/t/Macro/RandomAssetProxy.t
+++ b/t/Macro/RandomAssetProxy.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/RandomThread.t b/t/Macro/RandomThread.t
index c7a93a258..4121aaaec 100644
--- a/t/Macro/RandomThread.t
+++ b/t/Macro/RandomThread.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/RootTitle.t b/t/Macro/RootTitle.t
index 5c2547f6d..4249dccfc 100644
--- a/t/Macro/RootTitle.t
+++ b/t/Macro/RootTitle.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/SQL.t b/t/Macro/SQL.t
index b6b26b521..43080cec3 100644
--- a/t/Macro/SQL.t
+++ b/t/Macro/SQL.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::Slash_gatewayUrl;
diff --git a/t/Macro/SessionId.t b/t/Macro/SessionId.t
index 5c4867db4..b1069da05 100644
--- a/t/Macro/SessionId.t
+++ b/t/Macro/SessionId.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Slash_gatewayUrl.t b/t/Macro/Slash_gatewayUrl.t
index 670de8cc4..97aeb7076 100644
--- a/t/Macro/Slash_gatewayUrl.t
+++ b/t/Macro/Slash_gatewayUrl.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Spacer.t b/t/Macro/Spacer.t
index 6ef495fc8..101b2ac23 100644
--- a/t/Macro/Spacer.t
+++ b/t/Macro/Spacer.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::Spacer;
diff --git a/t/Macro/SpectreCheck.t b/t/Macro/SpectreCheck.t
index c64a0e6e8..d0b154767 100644
--- a/t/Macro/SpectreCheck.t
+++ b/t/Macro/SpectreCheck.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/Splat_random.t b/t/Macro/Splat_random.t
index 3326c9880..d8c10202c 100644
--- a/t/Macro/Splat_random.t
+++ b/t/Macro/Splat_random.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::Splat_random;
diff --git a/t/Macro/Thumbnail.t b/t/Macro/Thumbnail.t
index 0faa5213d..2c8a335b4 100644
--- a/t/Macro/Thumbnail.t
+++ b/t/Macro/Thumbnail.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::Thumbnail;
diff --git a/t/Macro/TwitterLogin.t b/t/Macro/TwitterLogin.t
index 7b50bbb3f..7ae3ff8bf 100644
--- a/t/Macro/TwitterLogin.t
+++ b/t/Macro/TwitterLogin.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Macro/URLEncode.t b/t/Macro/URLEncode.t
index f5c21668b..b4dfc1543 100644
--- a/t/Macro/URLEncode.t
+++ b/t/Macro/URLEncode.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::URLEncode;
diff --git a/t/Macro/User.t b/t/Macro/User.t
index 6ffb58797..4c57492fe 100644
--- a/t/Macro/User.t
+++ b/t/Macro/User.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::User;
diff --git a/t/Macro/UsersOnline.t b/t/Macro/UsersOnline.t
index 626f8ca62..108922b34 100644
--- a/t/Macro/UsersOnline.t
+++ b/t/Macro/UsersOnline.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use JSON;
 
diff --git a/t/Macro/ViewCart.t b/t/Macro/ViewCart.t
index 063b09421..865234d27 100644
--- a/t/Macro/ViewCart.t
+++ b/t/Macro/ViewCart.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/a_account.t b/t/Macro/a_account.t
index ad9154357..29c63f7f9 100644
--- a/t/Macro/a_account.t
+++ b/t/Macro/a_account.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/c_companyName.t b/t/Macro/c_companyName.t
index d3b22abb1..201079395 100644
--- a/t/Macro/c_companyName.t
+++ b/t/Macro/c_companyName.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/e_companyEmail.t b/t/Macro/e_companyEmail.t
index d54c6f0fa..1c294c46c 100644
--- a/t/Macro/e_companyEmail.t
+++ b/t/Macro/e_companyEmail.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Macro/r_printable.t b/t/Macro/r_printable.t
index adf721d57..05cecd335 100644
--- a/t/Macro/r_printable.t
+++ b/t/Macro/r_printable.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::r_printable;
diff --git a/t/Macro/u_companyUrl.t b/t/Macro/u_companyUrl.t
index 2149df6a1..8cb08f285 100644
--- a/t/Macro/u_companyUrl.t
+++ b/t/Macro/u_companyUrl.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Macro::u_companyUrl;
diff --git a/t/Mail/Send.t b/t/Mail/Send.t
index 566563500..92351c7ab 100644
--- a/t/Mail/Send.t
+++ b/t/Mail/Send.t
@@ -12,8 +12,6 @@
 # This script tests the creation, sending, and queuing of mail messages
 # TODO: There is plenty left to do in this script.
 use strict;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use JSON qw( from_json to_json );
 use Test::More;
 use Test::Deep;
diff --git a/t/Operation/AdSpace.t b/t/Operation/AdSpace.t
index a07fe923f..f1f8976da 100644
--- a/t/Operation/AdSpace.t
+++ b/t/Operation/AdSpace.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Operation/Auth.t b/t/Operation/Auth.t
index 495562d7c..d6d331628 100644
--- a/t/Operation/Auth.t
+++ b/t/Operation/Auth.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Operation/User/service.t b/t/Operation/User/service.t
index 85d6c6460..21f7bfa65 100644
--- a/t/Operation/User/service.t
+++ b/t/Operation/User/service.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/POD.t b/t/POD.t
index 5d08edd07..9bbb6a2d2 100644
--- a/t/POD.t
+++ b/t/POD.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use Test::More;
diff --git a/t/Paginator.t b/t/Paginator.t
index f3ea0b1bf..867596174 100644
--- a/t/Paginator.t
+++ b/t/Paginator.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/PassiveProfiling.t b/t/PassiveProfiling.t
index b26ae5c16..13ae32063 100644
--- a/t/PassiveProfiling.t
+++ b/t/PassiveProfiling.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 
diff --git a/t/Pluggable.t b/t/Pluggable.t
index 5e98a57cf..0b7703d46 100644
--- a/t/Pluggable.t
+++ b/t/Pluggable.t
@@ -12,9 +12,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use WebGUI::Test;
 use File::Find;
diff --git a/t/PodChecker.t b/t/PodChecker.t
index 1502032d2..c213168f2 100644
--- a/t/PodChecker.t
+++ b/t/PodChecker.t
@@ -9,8 +9,6 @@
 #-------------------------------------------------------------------
 
 use strict;
-use FindBin qw($Bin);
-use lib "$FindBin::Bin/lib";
 
 use File::Find;
 use Pod::Checker;
diff --git a/t/ProfileCategory.t b/t/ProfileCategory.t
index 95c0051da..b1fea3221 100644
--- a/t/ProfileCategory.t
+++ b/t/ProfileCategory.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 
diff --git a/t/ProfileField.t b/t/ProfileField.t
index 478af2b7b..4df66b10a 100644
--- a/t/ProfileField.t
+++ b/t/ProfileField.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use Data::Dumper;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/ProgressBar.t b/t/ProgressBar.t
index f4e582b79..3894072ae 100644
--- a/t/ProgressBar.t
+++ b/t/ProgressBar.t
@@ -23,8 +23,6 @@
 use strict;
 use warnings;
 
-use FindBin;
-use lib "$FindBin::Bin/lib";
 
 use Test::More;
 use Test::MockObject::Extends;
diff --git a/t/Role/Asset/Comments.t b/t/Role/Asset/Comments.t
index bf6aabfee..15afcf2b9 100644
--- a/t/Role/Asset/Comments.t
+++ b/t/Role/Asset/Comments.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Test::MockObject;
diff --git a/t/SQL.t b/t/SQL.t
index 8bef9a44e..e8b47a1da 100644
--- a/t/SQL.t
+++ b/t/SQL.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Search.t b/t/Search.t
index 2da50d94e..5af4daaff 100644
--- a/t/Search.t
+++ b/t/Search.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Search/Index.t b/t/Search/Index.t
index 72ab1e4b6..eb1e2d4df 100644
--- a/t/Search/Index.t
+++ b/t/Search/Index.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Session.t b/t/Session.t
index 55c32df17..03a4702a8 100644
--- a/t/Session.t
+++ b/t/Session.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Cache.t b/t/Session/Cache.t
index d1696f88d..602d3dcae 100644
--- a/t/Session/Cache.t
+++ b/t/Session/Cache.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Session/CheckClient.t b/t/Session/CheckClient.t
index b43e29eb6..6f08c16a2 100644
--- a/t/Session/CheckClient.t
+++ b/t/Session/CheckClient.t
@@ -18,9 +18,7 @@
 # so 100 will test all items, 75 will
 # test 75% or 3 out of four items
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use lib '/data/WebGUI/t/lib';
 
 use WebGUI::Test;
diff --git a/t/Session/DateTime.t b/t/Session/DateTime.t
index a4e83b327..3ceb49822 100644
--- a/t/Session/DateTime.t
+++ b/t/Session/DateTime.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use File::Copy;
 use File::Spec;
 
diff --git a/t/Session/ErrorHandler.t b/t/Session/ErrorHandler.t
index 07d13821f..a3a60ca6b 100644
--- a/t/Session/ErrorHandler.t
+++ b/t/Session/ErrorHandler.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Form.t b/t/Session/Form.t
index 860522ebf..274e4c0c9 100644
--- a/t/Session/Form.t
+++ b/t/Session/Form.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Http.t b/t/Session/Http.t
index 3156e0fb5..92237691d 100644
--- a/t/Session/Http.t
+++ b/t/Session/Http.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Icon.t b/t/Session/Icon.t
index fe5160acc..3819d874d 100644
--- a/t/Session/Icon.t
+++ b/t/Session/Icon.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Id.t b/t/Session/Id.t
index b3bb07867..ad78068f9 100644
--- a/t/Session/Id.t
+++ b/t/Session/Id.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Output.t b/t/Session/Output.t
index 892b31b29..15c35f897 100644
--- a/t/Session/Output.t
+++ b/t/Session/Output.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Privilege.t b/t/Session/Privilege.t
index 190f74a8f..f5f1036d4 100644
--- a/t/Session/Privilege.t
+++ b/t/Session/Privilege.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Scratch.t b/t/Session/Scratch.t
index ac690e23d..9616142f8 100644
--- a/t/Session/Scratch.t
+++ b/t/Session/Scratch.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Setting.t b/t/Session/Setting.t
index ce90ea387..6caf46bad 100644
--- a/t/Session/Setting.t
+++ b/t/Session/Setting.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Stow.t b/t/Session/Stow.t
index f0cae8b62..fa6af884e 100644
--- a/t/Session/Stow.t
+++ b/t/Session/Stow.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Style.t b/t/Session/Style.t
index 99214b8cd..4e5d7bef6 100644
--- a/t/Session/Style.t
+++ b/t/Session/Style.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use HTML::TokeParser;
 
 use WebGUI::Test;
diff --git a/t/Session/Url.t b/t/Session/Url.t
index 5836267b5..48e489305 100644
--- a/t/Session/Url.t
+++ b/t/Session/Url.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Session/Var.t b/t/Session/Var.t
index 19a790176..20dcaea4c 100644
--- a/t/Session/Var.t
+++ b/t/Session/Var.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
  
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Shop/Address.t b/t/Shop/Address.t
index 081f358c5..ccbcb788c 100644
--- a/t/Shop/Address.t
+++ b/t/Shop/Address.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Exception::Class;
diff --git a/t/Shop/AddressBook.t b/t/Shop/AddressBook.t
index 891fa522e..9701b3d02 100644
--- a/t/Shop/AddressBook.t
+++ b/t/Shop/AddressBook.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Exception::Class;
diff --git a/t/Shop/Cart.t b/t/Shop/Cart.t
index 11aa2e347..1d546dd10 100644
--- a/t/Shop/Cart.t
+++ b/t/Shop/Cart.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Scalar::Util qw/refaddr/;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Shop/Pay.t b/t/Shop/Pay.t
index de92bf077..329ea0003 100644
--- a/t/Shop/Pay.t
+++ b/t/Shop/Pay.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Test::Exception;
diff --git a/t/Shop/PayDriver.t b/t/Shop/PayDriver.t
index 2e09a7839..da0230a07 100644
--- a/t/Shop/PayDriver.t
+++ b/t/Shop/PayDriver.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Shop/PayDriver/ITransact.t b/t/Shop/PayDriver/ITransact.t
index b03f497ce..d8d2d8df8 100644
--- a/t/Shop/PayDriver/ITransact.t
+++ b/t/Shop/PayDriver/ITransact.t
@@ -13,9 +13,7 @@
 #
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Shop/PayDriver/Ogone.t b/t/Shop/PayDriver/Ogone.t
index ae405f974..06883cacc 100644
--- a/t/Shop/PayDriver/Ogone.t
+++ b/t/Shop/PayDriver/Ogone.t
@@ -13,9 +13,7 @@
 #
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Shop/PayDriver/PayPalStd.t b/t/Shop/PayDriver/PayPalStd.t
index fe1f746d5..d2162b6a6 100644
--- a/t/Shop/PayDriver/PayPalStd.t
+++ b/t/Shop/PayDriver/PayPalStd.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Shop/Ship.t b/t/Shop/Ship.t
index a96068343..d139316a1 100644
--- a/t/Shop/Ship.t
+++ b/t/Shop/Ship.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Test::Exception;
diff --git a/t/Shop/ShipDriver.t b/t/Shop/ShipDriver.t
index 01095937f..2dd0b815b 100644
--- a/t/Shop/ShipDriver.t
+++ b/t/Shop/ShipDriver.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Shop/ShipDriver/FlatRate.t b/t/Shop/ShipDriver/FlatRate.t
index df7d64717..a11089c20 100644
--- a/t/Shop/ShipDriver/FlatRate.t
+++ b/t/Shop/ShipDriver/FlatRate.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Shop/ShipDriver/UPS.t b/t/Shop/ShipDriver/UPS.t
index 3d6025c2d..c27e729e7 100644
--- a/t/Shop/ShipDriver/UPS.t
+++ b/t/Shop/ShipDriver/UPS.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use XML::Simple;
diff --git a/t/Shop/ShipDriver/USPS.t b/t/Shop/ShipDriver/USPS.t
index 3d377051b..0efa4347f 100644
--- a/t/Shop/ShipDriver/USPS.t
+++ b/t/Shop/ShipDriver/USPS.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use XML::Simple;
diff --git a/t/Shop/ShipDriver/USPSInternational.t b/t/Shop/ShipDriver/USPSInternational.t
index 15fb51917..4a17c9b8d 100644
--- a/t/Shop/ShipDriver/USPSInternational.t
+++ b/t/Shop/ShipDriver/USPSInternational.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use XML::Simple;
diff --git a/t/Shop/Tax.t b/t/Shop/Tax.t
index 9af7e4b80..bec257667 100644
--- a/t/Shop/Tax.t
+++ b/t/Shop/Tax.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Exception;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Shop/TaxDriver/EU.t b/t/Shop/TaxDriver/EU.t
index cf83cc10e..a5c483dca 100644
--- a/t/Shop/TaxDriver/EU.t
+++ b/t/Shop/TaxDriver/EU.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Test::MockObject::Extends;
diff --git a/t/Shop/TaxDriver/Generic.t b/t/Shop/TaxDriver/Generic.t
index 6b9c03965..cfbad801c 100644
--- a/t/Shop/TaxDriver/Generic.t
+++ b/t/Shop/TaxDriver/Generic.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Exception::Class;
diff --git a/t/Shop/Transaction.t b/t/Shop/Transaction.t
index 0761bd46c..0bda1b01d 100644
--- a/t/Shop/Transaction.t
+++ b/t/Shop/Transaction.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Shop/Vendor.t b/t/Shop/Vendor.t
index f36d5ae0a..ea3ee6b8e 100644
--- a/t/Shop/Vendor.t
+++ b/t/Shop/Vendor.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use JSON;
diff --git a/t/Spectre/Workflow.t b/t/Spectre/Workflow.t
index dc1a94ceb..d10d94a6b 100644
--- a/t/Spectre/Workflow.t
+++ b/t/Spectre/Workflow.t
@@ -9,13 +9,11 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
 
 use Test::More;
 
-use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Paths;
diff --git a/t/Storage.t b/t/Storage.t
index e37d38a92..cb1e27ffb 100644
--- a/t/Storage.t
+++ b/t/Storage.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Storage/Image.t b/t/Storage/Image.t
index 57c73f69b..337bb80cf 100644
--- a/t/Storage/Image.t
+++ b/t/Storage/Image.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 our $todo;
 
 use WebGUI::Test;
diff --git a/t/Text.t b/t/Text.t
index f6cf59002..a4a6f109a 100644
--- a/t/Text.t
+++ b/t/Text.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Text;
 use Test::More;
diff --git a/t/Upgrade.t b/t/Upgrade.t
index c184e1386..6e8dd6bc9 100644
--- a/t/Upgrade.t
+++ b/t/Upgrade.t
@@ -2,9 +2,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test import => [qw(collateral addToCleanup)];
 use Test::More;
diff --git a/t/User.t b/t/User.t
index 46569f943..a3496f5fd 100644
--- a/t/User.t
+++ b/t/User.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Utility.t b/t/Utility.t
index ce195eed0..e553050d5 100644
--- a/t/Utility.t
+++ b/t/Utility.t
@@ -9,9 +9,7 @@
 #-------------------------------------------------------------------
 
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Tie::IxHash;
 
 use WebGUI::Test;
diff --git a/t/VersionTag.t b/t/VersionTag.t
index d473a6409..63b2bda19 100644
--- a/t/VersionTag.t
+++ b/t/VersionTag.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::VersionTag;
diff --git a/t/WebGUI_conf.t b/t/WebGUI_conf.t
index 06e2105d0..b327be737 100644
--- a/t/WebGUI_conf.t
+++ b/t/WebGUI_conf.t
@@ -11,9 +11,7 @@
 
 # Test the default WebGUI.conf file to make sure it is valid JSON.
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Session;
diff --git a/t/Whitespace.t b/t/Whitespace.t
index c7f4b53a6..ccb7d3c70 100644
--- a/t/Whitespace.t
+++ b/t/Whitespace.t
@@ -9,8 +9,6 @@
 #-------------------------------------------------------------------
 
 use strict;
-use FindBin qw($Bin);
-use lib "$FindBin::Bin/lib";
 
 use File::Find;
 use Test::More;
diff --git a/t/Wizard.t b/t/Wizard.t
index bd94a779b..47dccb693 100644
--- a/t/Wizard.t
+++ b/t/Wizard.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Workflow.t b/t/Workflow.t
index eb5956198..a59c8bab4 100644
--- a/t/Workflow.t
+++ b/t/Workflow.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Workflow;
diff --git a/t/Workflow/Activity/ArchiveOldStories.t b/t/Workflow/Activity/ArchiveOldStories.t
index ba879f3de..3ff7f65f0 100644
--- a/t/Workflow/Activity/ArchiveOldStories.t
+++ b/t/Workflow/Activity/ArchiveOldStories.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use WebGUI::Test;
 use WebGUI::Asset;
diff --git a/t/Workflow/Activity/BucketPassiveAnalytics.t b/t/Workflow/Activity/BucketPassiveAnalytics.t
index d4fade6e4..d33151304 100644
--- a/t/Workflow/Activity/BucketPassiveAnalytics.t
+++ b/t/Workflow/Activity/BucketPassiveAnalytics.t
@@ -1,7 +1,5 @@
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 #use DB;
 
 use WebGUI::Test;
diff --git a/t/Workflow/Activity/CalendarUpdateFeeds.t b/t/Workflow/Activity/CalendarUpdateFeeds.t
index 9f97f5e7c..515e9b3eb 100644
--- a/t/Workflow/Activity/CalendarUpdateFeeds.t
+++ b/t/Workflow/Activity/CalendarUpdateFeeds.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Workflow/Activity/DeleteExpiredSessions.t b/t/Workflow/Activity/DeleteExpiredSessions.t
index f3d33272d..80250918f 100644
--- a/t/Workflow/Activity/DeleteExpiredSessions.t
+++ b/t/Workflow/Activity/DeleteExpiredSessions.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Workflow/Activity/ExpireIncompleteSurveyResponses.t b/t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
index 2fa2fd2a9..8180fa216 100644
--- a/t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
+++ b/t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
@@ -2,8 +2,6 @@
 
 use strict;
 use warnings;
-use FindBin qw($Bin);
-use lib "$FindBin::Bin/../../lib";
 use WebGUI::Test;
 use Test::More;
 
diff --git a/t/Workflow/Activity/ExtendCalendarRecurrences.t b/t/Workflow/Activity/ExtendCalendarRecurrences.t
index 9c1762b31..daa060824 100644
--- a/t/Workflow/Activity/ExtendCalendarRecurrences.t
+++ b/t/Workflow/Activity/ExtendCalendarRecurrences.t
@@ -9,10 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
-use lib "$FindBin::Bin/../../t/lib";
 use Test::More;
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Workflow/Activity/GetCsMail.t b/t/Workflow/Activity/GetCsMail.t
index c1cf4a4a8..245b540f7 100644
--- a/t/Workflow/Activity/GetCsMail.t
+++ b/t/Workflow/Activity/GetCsMail.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use WebGUI::Test; # Must use this before any other WebGUI modules
 use WebGUI::Test::MockAsset;
diff --git a/t/Workflow/Activity/NotifyAboutLowStock.t b/t/Workflow/Activity/NotifyAboutLowStock.t
index 1efca38d0..bc7028643 100644
--- a/t/Workflow/Activity/NotifyAboutLowStock.t
+++ b/t/Workflow/Activity/NotifyAboutLowStock.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use WebGUI::Test;
 use WebGUI::Asset;
diff --git a/t/Workflow/Activity/RecheckVATNumber.t b/t/Workflow/Activity/RecheckVATNumber.t
index 7f73bf065..054085ca1 100644
--- a/t/Workflow/Activity/RecheckVATNumber.t
+++ b/t/Workflow/Activity/RecheckVATNumber.t
@@ -13,9 +13,7 @@
 # 
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use WebGUI::Test; # Must use this before any other WebGUI modules
diff --git a/t/Workflow/Activity/RemoveOldCarts.t b/t/Workflow/Activity/RemoveOldCarts.t
index cf43d533d..6d0cc1162 100644
--- a/t/Workflow/Activity/RemoveOldCarts.t
+++ b/t/Workflow/Activity/RemoveOldCarts.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Workflow/Activity/SendNewsletters.t b/t/Workflow/Activity/SendNewsletters.t
index 8fc85cb3a..85a46196d 100644
--- a/t/Workflow/Activity/SendNewsletters.t
+++ b/t/Workflow/Activity/SendNewsletters.t
@@ -9,9 +9,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 use Test::More;
 use Test::Deep;
 use Data::Dumper;
diff --git a/t/Workflow/Activity/TrashExpiredEvents.t b/t/Workflow/Activity/TrashExpiredEvents.t
index a89534965..5b7786d13 100644
--- a/t/Workflow/Activity/TrashExpiredEvents.t
+++ b/t/Workflow/Activity/TrashExpiredEvents.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/Workflow/Instance.t b/t/Workflow/Instance.t
index 247fd856f..747b6ff15 100644
--- a/t/Workflow/Instance.t
+++ b/t/Workflow/Instance.t
@@ -12,9 +12,7 @@
 # Tests for WebGUI::Workflow::Instance
 #
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 use Test::Deep;
 use Test::Exception;
diff --git a/t/badExtrasMacros.t b/t/badExtrasMacros.t
index f6af6186c..79ec867a7 100644
--- a/t/badExtrasMacros.t
+++ b/t/badExtrasMacros.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/badGatewayMacros.t b/t/badGatewayMacros.t
index 7df1932e6..e77b62da2 100644
--- a/t/badGatewayMacros.t
+++ b/t/badGatewayMacros.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/hardcodedExtras.t b/t/hardcodedExtras.t
index 9aa10d19e..7caaf2b2b 100644
--- a/t/hardcodedExtras.t
+++ b/t/hardcodedExtras.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/i18n/adminConsole.t b/t/i18n/adminConsole.t
index 4e251739b..ddc920df2 100644
--- a/t/i18n/adminConsole.t
+++ b/t/i18n/adminConsole.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/../lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::International;
diff --git a/t/i18n/critic_labels.t b/t/i18n/critic_labels.t
index 05518ef49..83dcd9a62 100644
--- a/t/i18n/critic_labels.t
+++ b/t/i18n/critic_labels.t
@@ -14,9 +14,7 @@
 #
 
 use Path::Class;
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/../lib";
 use Test::More;
 plan skip_all => 'set CODE_COP to enable this test' unless $ENV{CODE_COP};
 
@@ -33,6 +31,5 @@ if ($@) {
 # Init
 my $session         = WebGUI::Test->session;
 
-my $label_profile = Path::Class::File->new( $FindBin::Bin )->parent->file('i18n', 'perlcriticrc');
 Test::Perl::Critic->import(-profile => $label_profile->stringify);
 all_critic_ok(WebGUI::Test->lib);
diff --git a/t/i18n/help.t b/t/i18n/help.t
index bab4ac100..383c74149 100644
--- a/t/i18n/help.t
+++ b/t/i18n/help.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/../lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::Operation::Help;
diff --git a/t/i18n/template.t b/t/i18n/template.t
index 07bb49315..591a6c155 100644
--- a/t/i18n/template.t
+++ b/t/i18n/template.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/../lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::Operation::Help;
diff --git a/t/mandatory_template_vars.t b/t/mandatory_template_vars.t
index c42819532..859a30c89 100644
--- a/t/mandatory_template_vars.t
+++ b/t/mandatory_template_vars.t
@@ -8,9 +8,7 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
-use lib "$FindBin::Bin/lib";
 
 use WebGUI::Test;
 use WebGUI::Asset;
diff --git a/t/rawHrefUrls.t b/t/rawHrefUrls.t
index b1d0d422f..7d3f6c3e1 100644
--- a/t/rawHrefUrls.t
+++ b/t/rawHrefUrls.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::Session;
diff --git a/t/templateSyntax.t b/t/templateSyntax.t
index b64437b63..8764b47fc 100644
--- a/t/templateSyntax.t
+++ b/t/templateSyntax.t
@@ -8,10 +8,8 @@
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use FindBin;
 use strict;
 use warnings;
-use lib "$FindBin::Bin/lib"; ##t/lib
 
 use WebGUI::Test;
 use WebGUI::Session;