Index: trunk/Nebulous/t/02_server_setup.t
===================================================================
--- trunk/Nebulous/t/02_server_setup.t	(revision 5668)
+++ trunk/Nebulous/t/02_server_setup.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 02_server_setup.t,v 1.4 2005-08-25 01:40:04 jhoblitt Exp $
+# $Id: 02_server_setup.t,v 1.5 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -17,11 +17,11 @@
 Test::Nebulous->setup;
 
-ok(
-    Nebulous::Server->init(
+isa_ok(
+    Nebulous::Server->new(
         dsn         => "DBI:mysql:database=test:host=localhost",
         dbuser      => "test",
         dbpasswd    => "",
     ),
-    "connect",
+    "Nebulous::Server"
 );
 
@@ -29,5 +29,5 @@
 
 eval {
-    Nebulous::Server->init(
+    Nebulous::Server->new(
         dsn         => "DBI:mysql:database=foobar:host=localhost",
         dbuser      => "baz",
Index: trunk/Nebulous/t/03_server_create_object.t
===================================================================
--- trunk/Nebulous/t/03_server_create_object.t	(revision 5668)
+++ trunk/Nebulous/t/03_server_create_object.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.10 2005-11-10 22:07:53 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.11 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
Index: trunk/Nebulous/t/04_server_replicate_object.t
===================================================================
--- trunk/Nebulous/t/04_server_replicate_object.t	(revision 5668)
+++ trunk/Nebulous/t/04_server_replicate_object.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
Index: trunk/Nebulous/t/05_server_lock_object.t
===================================================================
--- trunk/Nebulous/t/05_server_lock_object.t	(revision 5668)
+++ trunk/Nebulous/t/05_server_lock_object.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 05_server_lock_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
+# $Id: 05_server_lock_object.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
Index: trunk/Nebulous/t/06_server_unlock_object.t
===================================================================
--- trunk/Nebulous/t/06_server_unlock_object.t	(revision 5668)
+++ trunk/Nebulous/t/06_server_unlock_object.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 06_server_unlock_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
+# $Id: 06_server_unlock_object.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
Index: trunk/Nebulous/t/07_server_find_instances.t
===================================================================
--- trunk/Nebulous/t/07_server_find_instances.t	(revision 5668)
+++ trunk/Nebulous/t/07_server_find_instances.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 07_server_find_instances.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
+# $Id: 07_server_find_instances.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
Index: trunk/Nebulous/t/08_server_delete_instance.t
===================================================================
--- trunk/Nebulous/t/08_server_delete_instance.t	(revision 5668)
+++ trunk/Nebulous/t/08_server_delete_instance.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 08_server_delete_instance.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
+# $Id: 08_server_delete_instance.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
Index: trunk/Nebulous/t/09_server_is_valid_class_id.t
===================================================================
--- trunk/Nebulous/t/09_server_is_valid_class_id.t	(revision 5668)
+++ trunk/Nebulous/t/09_server_is_valid_class_id.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_is_valid_class_id.t,v 1.1 2005-11-10 21:31:26 jhoblitt Exp $
+# $Id: 09_server_is_valid_class_id.t,v 1.2 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
@@ -24,19 +22,17 @@
 );
 
-*_is_valid_class_id = \&Nebulous::Server::_is_valid_class_id;
-
 Test::Nebulous->setup;
 
 # 0 is the default and is guarenteed to exist
-ok( _is_valid_class_id( 0 ), "default class id");
+ok( $neb->_is_valid_class_id( 0 ), "default class id");
 
 Test::Nebulous->setup;
 
 # the test setup adds class id 1
-ok( _is_valid_class_id( 1 ), "custom class id");
+ok( $neb->_is_valid_class_id( 1 ), "custom class id");
 
 Test::Nebulous->setup;
 
-is( _is_valid_class_id( 99 ), undef, "invalid class id");
+is( $neb->_is_valid_class_id( 99 ), undef, "invalid class id");
 
 Test::Nebulous->cleanup;
Index: trunk/Nebulous/t/09_server_stat_object.t
===================================================================
--- trunk/Nebulous/t/09_server_stat_object.t	(revision 5668)
+++ trunk/Nebulous/t/09_server_stat_object.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.7 2005-11-09 01:35:59 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.8 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
Index: trunk/Nebulous/t/10_server_is_valid_volume_name.t
===================================================================
--- trunk/Nebulous/t/10_server_is_valid_volume_name.t	(revision 5668)
+++ trunk/Nebulous/t/10_server_is_valid_volume_name.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 10_server_is_valid_volume_name.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+# $Id: 10_server_is_valid_volume_name.t,v 1.2 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
@@ -24,17 +22,15 @@
 );
 
-*_is_valid_volume_name = \&Nebulous::Server::_is_valid_volume_name;
+Test::Nebulous->setup;
+
+ok( $neb->_is_valid_volume_name( 'node01' ), "valid volume name" );
 
 Test::Nebulous->setup;
 
-ok( _is_valid_volume_name( 'node01' ), "valid volume name" );
+ok( $neb->_is_valid_volume_name( 'node02' ), "valid volume name" );
 
 Test::Nebulous->setup;
 
-ok( _is_valid_volume_name( 'node02' ), "valid volume name" );
-
-Test::Nebulous->setup;
-
-is( _is_valid_volume_name( 'node99' ), undef, "invalid volume name" );
+is( $neb->_is_valid_volume_name( 'node99' ), undef, "invalid volume name" );
 
 Test::Nebulous->cleanup;
Index: trunk/Nebulous/t/11_server_is_valid_class_id.t
===================================================================
--- trunk/Nebulous/t/11_server_is_valid_class_id.t	(revision 5668)
+++ trunk/Nebulous/t/11_server_is_valid_class_id.t	(revision 10546)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 11_server_is_valid_class_id.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+# $Id: 11_server_is_valid_class_id.t,v 1.2 2006-12-08 03:29:19 jhoblitt Exp $
 
 use strict;
@@ -16,7 +16,5 @@
 use Test::Nebulous;
 
-my $neb = "Nebulous::Server";
-
-$neb->init(
+my $neb = Nebulous::Server->new(
     dsn         => "DBI:mysql:database=test:host=localhost",
     dbuser      => "test",
@@ -24,19 +22,17 @@
 );
 
-*_is_valid_class_id = \&Nebulous::Server::_is_valid_class_id;
-
 Test::Nebulous->setup;
 
 # 0 is the default and is guarenteed to exist
-ok( _is_valid_class_id( 0 ), "default class id");
+ok( $neb->_is_valid_class_id( 0 ), "default class id");
 
 Test::Nebulous->setup;
 
 # the test setup adds class id 1
-ok( _is_valid_class_id( 1 ), "custom class id");
+ok( $neb->_is_valid_class_id( 1 ), "custom class id");
 
 Test::Nebulous->setup;
 
-is( _is_valid_class_id( 99 ), undef, "invalid class id");
+is( $neb->_is_valid_class_id( 99 ), undef, "invalid class id");
 
 Test::Nebulous->cleanup;