Index: trunk/Nebulous-Server/t/01_load.t
===================================================================
--- trunk/Nebulous-Server/t/01_load.t	(revision 16281)
+++ trunk/Nebulous-Server/t/01_load.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 01_load.t,v 1.7 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 01_load.t,v 1.8 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -10,10 +10,6 @@
 use lib qw( ./t ./lib );
 
-use Test::More tests => 8;
+use Test::More tests => 4;
 
-BEGIN { use_ok( 'Nebulous::Client' ); }
-BEGIN { use_ok( 'Nebulous::Client::Log' ); }
-BEGIN { use_ok( 'Nebulous::Client::HTTP' ); }
-BEGIN { use_ok( 'Nebulous::Util' ); }
 BEGIN { use_ok( 'Nebulous::Server' ); }
 BEGIN { use_ok( 'Nebulous::Server::SQL' ); }
Index: trunk/Nebulous-Server/t/03_server_create_object.t
===================================================================
--- trunk/Nebulous-Server/t/03_server_create_object.t	(revision 16281)
+++ trunk/Nebulous-Server/t/03_server_create_object.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.24 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.25 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -14,5 +14,4 @@
 use File::ExtAttr qw( getfattr );
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 use Test::URI;
Index: trunk/Nebulous-Server/t/04_server_replicate_object.t
===================================================================
--- trunk/Nebulous-Server/t/04_server_replicate_object.t	(revision 16281)
+++ trunk/Nebulous-Server/t/04_server_replicate_object.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.11 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.12 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -14,5 +14,4 @@
 use File::ExtAttr qw( getfattr );
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 use Test::URI;
Index: trunk/Nebulous-Server/t/05_server_lock_object.t
===================================================================
--- trunk/Nebulous-Server/t/05_server_lock_object.t	(revision 16281)
+++ trunk/Nebulous-Server/t/05_server_lock_object.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 05_server_lock_object.t,v 1.9 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 05_server_lock_object.t,v 1.10 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/06_server_unlock_object.t
===================================================================
--- trunk/Nebulous-Server/t/06_server_unlock_object.t	(revision 16281)
+++ trunk/Nebulous-Server/t/06_server_unlock_object.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 06_server_unlock_object.t,v 1.9 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 06_server_unlock_object.t,v 1.10 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/07_server_find_instances.t
===================================================================
--- trunk/Nebulous-Server/t/07_server_find_instances.t	(revision 16281)
+++ trunk/Nebulous-Server/t/07_server_find_instances.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 07_server_find_instances.t,v 1.9 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 07_server_find_instances.t,v 1.10 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::URI;
 use Test::Nebulous;
Index: trunk/Nebulous-Server/t/08_server_delete_instance.t
===================================================================
--- trunk/Nebulous-Server/t/08_server_delete_instance.t	(revision 16281)
+++ trunk/Nebulous-Server/t/08_server_delete_instance.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 08_server_delete_instance.t,v 1.9 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 08_server_delete_instance.t,v 1.10 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/09_server_stat_object.t
===================================================================
--- trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 16281)
+++ trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.12 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.13 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t
===================================================================
--- trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t	(revision 16281)
+++ trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 10_server_is_valid_volume_name.t,v 1.4 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 10_server_is_valid_volume_name.t,v 1.5 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/11_server_is_valid_object_key.t
===================================================================
--- trunk/Nebulous-Server/t/11_server_is_valid_object_key.t	(revision 16281)
+++ trunk/Nebulous-Server/t/11_server_is_valid_object_key.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 11_server_is_valid_object_key.t,v 1.2 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 11_server_is_valid_object_key.t,v 1.3 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/12_server_find_objects.t
===================================================================
--- trunk/Nebulous-Server/t/12_server_find_objects.t	(revision 16281)
+++ trunk/Nebulous-Server/t/12_server_find_objects.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 12_server_find_objects.t,v 1.2 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 12_server_find_objects.t,v 1.3 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/13_server_rename_object.t
===================================================================
--- trunk/Nebulous-Server/t/13_server_rename_object.t	(revision 16281)
+++ trunk/Nebulous-Server/t/13_server_rename_object.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2007  Joshua Hoblitt
 #
-# $Id: 13_server_rename_object.t,v 1.3 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 13_server_rename_object.t,v 1.4 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
Index: trunk/Nebulous-Server/t/14_server_xattr.t
===================================================================
--- trunk/Nebulous-Server/t/14_server_xattr.t	(revision 16281)
+++ trunk/Nebulous-Server/t/14_server_xattr.t	(revision 17072)
@@ -3,5 +3,5 @@
 # Copryight (C) 2007  Joshua Hoblitt
 #
-# $Id: 14_server_xattr.t,v 1.3 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: 14_server_xattr.t,v 1.4 2008-03-20 21:10:14 jhoblitt Exp $
 
 use strict;
@@ -13,5 +13,4 @@
 
 use Nebulous::Server;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;