Index: trunk/Nebulous-Server/t/03_server_create_object.t
===================================================================
--- trunk/Nebulous-Server/t/03_server_create_object.t	(revision 13087)
+++ trunk/Nebulous-Server/t/03_server_create_object.t	(revision 13092)
@@ -3,10 +3,10 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.12 2007-04-23 20:42:29 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.13 2007-05-01 02:52:04 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 14;
+use Test::More tests => 8;
 
 use lib qw( ./t ./lib );
@@ -38,28 +38,6 @@
 
 {
-    # key, class
-    my $uri = $neb->create_object("foo", 0);
-
-    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
-    ok(-e $path, "file exists");
-    uri_scheme_ok($uri, 'file');
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume
-    my $uri = $neb->create_object("foo", 0, "node01");
-
-    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
-    ok(-e $path, "file exists");
-    uri_scheme_ok($uri, 'file');
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume, comment
-    my $uri = $neb->create_object("foo", 0, "node01", "this is foo");
+    # key, volume
+    my $uri = $neb->create_object("foo", "node01");
 
     my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
@@ -78,24 +56,8 @@
 Test::Nebulous->setup;
 
-{
-    my $uri = $neb->create_object("foo", 1);
-
-    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
-    ok(-e $path, "class exists");
-}
-
-Test::Nebulous->setup;
-
 eval {
     $neb->create_object("foo", 99);
 };
-like($@, qr/did not pass the \'is valid class id\'/, "class doesn't exist");
-
-Test::Nebulous->setup;
-
-eval {
-    $neb->create_object(1, 0, 'node01', 'x' x 256);
-};
-like($@, qr/comment length/, "comment is too long");
+like($@, qr/did not pass the \'is valid volume name\'/, "volume name doesn't exist");
 
 Test::Nebulous->setup;
@@ -104,12 +66,12 @@
     $neb->create_object();
 };
-like($@, qr/2 - 4 were expected/, "no params");
+like($@, qr/1 - 2 were expected/, "no params");
 
 Test::Nebulous->setup;
 
 eval {
-    $neb->create_object( 1, 0, 'node01', 1, 1 );
+    $neb->create_object(1, "node01", 3);
 };
-like($@, qr/2 - 4 were expected/, "too many params");
+like($@, qr/1 - 2 were expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/09_server_is_valid_class_id.t
===================================================================
--- trunk/Nebulous-Server/t/09_server_is_valid_class_id.t	(revision 13087)
+++ 	(revision )
@@ -1,38 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 09_server_is_valid_class_id.t,v 1.3 2007-03-28 21:53:20 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Test::More tests => 3;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Server;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $neb = Nebulous::Server->new(
-    dsn         => "DBI:mysql:database=test:host=localhost",
-    dbuser      => "test",
-    dbpasswd    => "",
-);
-
-Test::Nebulous->setup;
-
-# 0 is the default and is guarenteed to exist
-ok($neb->_is_valid_class_id(0), "default class id");
-
-Test::Nebulous->setup;
-
-# the test setup adds class id 1
-ok($neb->_is_valid_class_id(1), "custom class id");
-
-Test::Nebulous->setup;
-
-is($neb->_is_valid_class_id(99), undef, "invalid class id");
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/09_server_stat_object.t
===================================================================
--- trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 13087)
+++ trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 13092)
@@ -3,10 +3,10 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.9 2007-03-28 22:01:37 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.10 2007-05-01 02:52:04 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 13;
+use Test::More tests => 11;
 
 use lib qw( ./t ./lib );
@@ -29,5 +29,5 @@
     my $info = $neb->stat_object("foo");
 
-    is(scalar @$info, 8, "number of columns");
+    is(scalar @$info, 6, "number of columns");
 }
 
@@ -35,17 +35,15 @@
 
 {
-    my $uri = $neb->create_object("foo", 0, "node01", "foobar");
+    my $uri = $neb->create_object("foo", "node01");
 
     my $info = $neb->stat_object("foo");
 
-    is(scalar @$info, 8,                       "number of columns");
+    is(scalar @$info, 6,                       "number of columns");
     is(@$info[0], 1,                           "so_id");
     is(@$info[1], "foo",                       "ext_id");
-    is(@$info[2], 0,                           "class_id");
-    is(@$info[3], "foobar",                    "comment");
-    is(@$info[4], 0,                           "read lock");
-    is(@$info[5], undef,                       "write lock");
-    like(@$info[6], qr/....-..-.. ..:..:../,   "epoch");
-    like(@$info[6], qr/....-..-.. ..:..:../,   "mtime");
+    is(@$info[2], 0,                           "read lock");
+    is(@$info[3], undef,                       "write lock");
+    like(@$info[4], qr/....-..-.. ..:..:../,   "epoch");
+    like(@$info[5], qr/....-..-.. ..:..:../,   "mtime");
 }
 
Index: trunk/Nebulous-Server/t/11_server_is_valid_class_id.t
===================================================================
--- trunk/Nebulous-Server/t/11_server_is_valid_class_id.t	(revision 13087)
+++ 	(revision )
@@ -1,38 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 11_server_is_valid_class_id.t,v 1.3 2007-03-28 23:11:28 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Test::More tests => 3;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Server;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $neb = Nebulous::Server->new(
-    dsn         => "DBI:mysql:database=test:host=localhost",
-    dbuser      => "test",
-    dbpasswd    => "",
-);
-
-Test::Nebulous->setup;
-
-# 0 is the default and is guarenteed to exist
-ok($neb->_is_valid_class_id(0), "default class id");
-
-Test::Nebulous->setup;
-
-# the test setup adds class id 1
-ok($neb->_is_valid_class_id(1), "custom class id");
-
-Test::Nebulous->setup;
-
-is($neb->_is_valid_class_id(99), undef, "invalid class id");
-
-Test::Nebulous->cleanup;