Index: /trunk/Nebulous-Server/Build.PL
===================================================================
--- /trunk/Nebulous-Server/Build.PL	(revision 12959)
+++ /trunk/Nebulous-Server/Build.PL	(revision 12960)
@@ -97,4 +97,5 @@
         'File::Temp'            => 0,
         'Test::More'            => '0.49',
+        'Test::URI'             => '1.06',
     },
     recommends          => {
Index: /trunk/Nebulous-Server/t/03_server_create_object.t
===================================================================
--- /trunk/Nebulous-Server/t/03_server_create_object.t	(revision 12959)
+++ /trunk/Nebulous-Server/t/03_server_create_object.t	(revision 12960)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.11 2006-12-08 03:29:19 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.12 2007-04-23 20:42:29 jhoblitt Exp $
 
 use strict;
@@ -15,4 +15,6 @@
 use Nebulous::Util qw( :standard );
 use Test::Nebulous;
+use Test::URI;
+use URI::Split qw( uri_split );
 
 my $neb = Nebulous::Server->new(
@@ -26,8 +28,9 @@
 {
     # key
-    my $uri = $neb->create_object( "foo" );
+    my $uri = $neb->create_object("foo");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -36,8 +39,9 @@
 {
     # key, class
-    my $uri = $neb->create_object( "foo", 0 );
+    my $uri = $neb->create_object("foo", 0);
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -46,8 +50,9 @@
 {
     # key, class, volume
-    my $uri = $neb->create_object( "foo", 0, "node01" );
+    my $uri = $neb->create_object("foo", 0, "node01");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -56,8 +61,9 @@
 {
     # key, class, volume, comment
-    my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" );
+    my $uri = $neb->create_object("foo", 0, "node01", "this is foo");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -65,15 +71,16 @@
 
 eval {
-    $neb->create_object( "foo" );
-    $neb->create_object( "foo" );
+    $neb->create_object("foo");
+    $neb->create_object("foo");
 };
-like( $@, qr/Duplicate entry/, "object already exists" );
+like($@, qr/Duplicate entry/, "object already exists");
 
 Test::Nebulous->setup;
 
 {
-    my $uri = $neb->create_object( "foo", 1 );
+    my $uri = $neb->create_object("foo", 1);
 
-    ok( -e _get_file_path( $uri ), "class exists" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "class exists");
 }
 
@@ -81,14 +88,14 @@
 
 eval {
-    $neb->create_object( "foo", 99 );
+    $neb->create_object("foo", 99);
 };
-like( $@, qr/did not pass the \'is valid class id\'/, "class doesn't exist" );
+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 );
+    $neb->create_object(1, 0, 'node01', 'x' x 256);
 };
-like( $@, qr/comment length/, "comment is too long" );
+like($@, qr/comment length/, "comment is too long");
 
 Test::Nebulous->setup;
@@ -97,5 +104,5 @@
     $neb->create_object();
 };
-like( $@, qr/2 - 4 were expected/, "no params" );
+like($@, qr/2 - 4 were expected/, "no params");
 
 Test::Nebulous->setup;
@@ -104,5 +111,5 @@
     $neb->create_object( 1, 0, 'node01', 1, 1 );
 };
-like( $@, qr/2 - 4 were expected/, "too many params" );
+like($@, qr/2 - 4 were expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: /trunk/Nebulous-Server/t/04_server_replicate_object.t
===================================================================
--- /trunk/Nebulous-Server/t/04_server_replicate_object.t	(revision 12959)
+++ /trunk/Nebulous-Server/t/04_server_replicate_object.t	(revision 12960)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.7 2007-04-23 20:42:29 jhoblitt Exp $
 
 use strict;
@@ -15,4 +15,6 @@
 use Nebulous::Util qw( :standard );
 use Test::Nebulous;
+use Test::URI;
+use URI::Split qw( uri_split );
 
 my $neb = Nebulous::Server->new(
@@ -26,9 +28,10 @@
 {
     # key
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo" );
+    $neb->create_object("foo");
+    my $uri = $neb->replicate_object("foo");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -37,9 +40,10 @@
 {
     # key, $volume
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo", "node01" );
+    $neb->create_object("foo");
+    my $uri = $neb->replicate_object("foo", "node01");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -48,12 +52,19 @@
 {
     # key, $volume
-    $neb->create_object( "foo" );
-    my $uri1 = $neb->replicate_object( "foo", "node01" );
-    my $uri2 = $neb->replicate_object( "foo", "node02" );
+    $neb->create_object("foo");
+    my $uri1 = $neb->replicate_object("foo", "node01");
+    my $uri2 = $neb->replicate_object("foo", "node02");
 
-    ok( -e _get_file_path( $uri1 ), "file exists" );
-    ok( -e _get_file_path( $uri2 ), "file exists" );
-    like( $uri1, qr/^file:\//, "valid URI" );
-    like( $uri2, qr/^file:\//, "valid URI" );
+    {
+        my ($scheme, $auth, $path, $query, $frag) = uri_split($uri1);
+        ok(-e $path, "file exists");
+        uri_scheme_ok($uri1, 'file');
+    }
+
+    {
+        my ($scheme, $auth, $path, $query, $frag) = uri_split($uri2);
+        ok(-e $path, "file exists");
+        uri_scheme_ok($uri2, 'file');
+    }
 }
 
@@ -61,7 +72,7 @@
 
 eval {
-    $neb->replicate_object( "foo" );
+    $neb->replicate_object("foo");
 };
-like( $@, qr/storage object does not exist/, "storage object does not exist" );
+like($@, qr/storage object does not exist/, "storage object does not exist");
 
 Test::Nebulous->setup;
@@ -70,12 +81,12 @@
     $neb->replicate_object();
 };
-like( $@, qr/1 - 2 were expected/, "no params" );
+like($@, qr/1 - 2 were expected/, "no params");
 
 Test::Nebulous->setup;
 
 eval {
-    $neb->replicate_object( 1, 2, 3 );
+    $neb->replicate_object(1, 2, 3);
 };
-like( $@, qr/1 - 2 were expected/, "too many params" );
+like($@, qr/1 - 2 were expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: /trunk/Nebulous/Build.PL
===================================================================
--- /trunk/Nebulous/Build.PL	(revision 12959)
+++ /trunk/Nebulous/Build.PL	(revision 12960)
@@ -97,4 +97,5 @@
         'File::Temp'            => 0,
         'Test::More'            => '0.49',
+        'Test::URI'             => '1.06',
     },
     recommends          => {
Index: /trunk/Nebulous/t/03_server_create_object.t
===================================================================
--- /trunk/Nebulous/t/03_server_create_object.t	(revision 12959)
+++ /trunk/Nebulous/t/03_server_create_object.t	(revision 12960)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.11 2006-12-08 03:29:19 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.12 2007-04-23 20:42:29 jhoblitt Exp $
 
 use strict;
@@ -15,4 +15,6 @@
 use Nebulous::Util qw( :standard );
 use Test::Nebulous;
+use Test::URI;
+use URI::Split qw( uri_split );
 
 my $neb = Nebulous::Server->new(
@@ -26,8 +28,9 @@
 {
     # key
-    my $uri = $neb->create_object( "foo" );
+    my $uri = $neb->create_object("foo");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -36,8 +39,9 @@
 {
     # key, class
-    my $uri = $neb->create_object( "foo", 0 );
+    my $uri = $neb->create_object("foo", 0);
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -46,8 +50,9 @@
 {
     # key, class, volume
-    my $uri = $neb->create_object( "foo", 0, "node01" );
+    my $uri = $neb->create_object("foo", 0, "node01");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -56,8 +61,9 @@
 {
     # key, class, volume, comment
-    my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" );
+    my $uri = $neb->create_object("foo", 0, "node01", "this is foo");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -65,15 +71,16 @@
 
 eval {
-    $neb->create_object( "foo" );
-    $neb->create_object( "foo" );
+    $neb->create_object("foo");
+    $neb->create_object("foo");
 };
-like( $@, qr/Duplicate entry/, "object already exists" );
+like($@, qr/Duplicate entry/, "object already exists");
 
 Test::Nebulous->setup;
 
 {
-    my $uri = $neb->create_object( "foo", 1 );
+    my $uri = $neb->create_object("foo", 1);
 
-    ok( -e _get_file_path( $uri ), "class exists" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "class exists");
 }
 
@@ -81,14 +88,14 @@
 
 eval {
-    $neb->create_object( "foo", 99 );
+    $neb->create_object("foo", 99);
 };
-like( $@, qr/did not pass the \'is valid class id\'/, "class doesn't exist" );
+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 );
+    $neb->create_object(1, 0, 'node01', 'x' x 256);
 };
-like( $@, qr/comment length/, "comment is too long" );
+like($@, qr/comment length/, "comment is too long");
 
 Test::Nebulous->setup;
@@ -97,5 +104,5 @@
     $neb->create_object();
 };
-like( $@, qr/2 - 4 were expected/, "no params" );
+like($@, qr/2 - 4 were expected/, "no params");
 
 Test::Nebulous->setup;
@@ -104,5 +111,5 @@
     $neb->create_object( 1, 0, 'node01', 1, 1 );
 };
-like( $@, qr/2 - 4 were expected/, "too many params" );
+like($@, qr/2 - 4 were expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: /trunk/Nebulous/t/04_server_replicate_object.t
===================================================================
--- /trunk/Nebulous/t/04_server_replicate_object.t	(revision 12959)
+++ /trunk/Nebulous/t/04_server_replicate_object.t	(revision 12960)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.7 2007-04-23 20:42:29 jhoblitt Exp $
 
 use strict;
@@ -15,4 +15,6 @@
 use Nebulous::Util qw( :standard );
 use Test::Nebulous;
+use Test::URI;
+use URI::Split qw( uri_split );
 
 my $neb = Nebulous::Server->new(
@@ -26,9 +28,10 @@
 {
     # key
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo" );
+    $neb->create_object("foo");
+    my $uri = $neb->replicate_object("foo");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -37,9 +40,10 @@
 {
     # key, $volume
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo", "node01" );
+    $neb->create_object("foo");
+    my $uri = $neb->replicate_object("foo", "node01");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -48,12 +52,19 @@
 {
     # key, $volume
-    $neb->create_object( "foo" );
-    my $uri1 = $neb->replicate_object( "foo", "node01" );
-    my $uri2 = $neb->replicate_object( "foo", "node02" );
+    $neb->create_object("foo");
+    my $uri1 = $neb->replicate_object("foo", "node01");
+    my $uri2 = $neb->replicate_object("foo", "node02");
 
-    ok( -e _get_file_path( $uri1 ), "file exists" );
-    ok( -e _get_file_path( $uri2 ), "file exists" );
-    like( $uri1, qr/^file:\//, "valid URI" );
-    like( $uri2, qr/^file:\//, "valid URI" );
+    {
+        my ($scheme, $auth, $path, $query, $frag) = uri_split($uri1);
+        ok(-e $path, "file exists");
+        uri_scheme_ok($uri1, 'file');
+    }
+
+    {
+        my ($scheme, $auth, $path, $query, $frag) = uri_split($uri2);
+        ok(-e $path, "file exists");
+        uri_scheme_ok($uri2, 'file');
+    }
 }
 
@@ -61,7 +72,7 @@
 
 eval {
-    $neb->replicate_object( "foo" );
+    $neb->replicate_object("foo");
 };
-like( $@, qr/storage object does not exist/, "storage object does not exist" );
+like($@, qr/storage object does not exist/, "storage object does not exist");
 
 Test::Nebulous->setup;
@@ -70,12 +81,12 @@
     $neb->replicate_object();
 };
-like( $@, qr/1 - 2 were expected/, "no params" );
+like($@, qr/1 - 2 were expected/, "no params");
 
 Test::Nebulous->setup;
 
 eval {
-    $neb->replicate_object( 1, 2, 3 );
+    $neb->replicate_object(1, 2, 3);
 };
-like( $@, qr/1 - 2 were expected/, "too many params" );
+like($@, qr/1 - 2 were expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: /trunk/Nebulous/t/51_client_create.t
===================================================================
--- /trunk/Nebulous/t/51_client_create.t	(revision 12959)
+++ /trunk/Nebulous/t/51_client_create.t	(revision 12960)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 51_client_create.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+# $Id: 51_client_create.t,v 1.2 2007-04-23 20:42:29 jhoblitt Exp $
 
 use strict;
@@ -10,11 +10,13 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 7;
+plan tests => 11;
 
 use lib qw( ./t ./lib );
 
+#use Nebulous::Client trace => 'debug';
 use Nebulous::Client;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
+use Test::URI;
+use URI::Split qw( uri_split );
 
 my $hostport = Apache::Test->config->{ 'hostport' };
@@ -28,7 +30,9 @@
     );
 
-    my $filename = $neb->create( "foo" );
+    my $uri = $neb->create("foo");
 
-    ok( -e $filename, "good filename" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "good filename");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -41,7 +45,9 @@
     );
 
-    my $filename = $neb->create( "foo", 0 );
+    my $uri = $neb->create("foo", 0);
 
-    ok( -e $filename, "good filename" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "good filename");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -54,7 +60,9 @@
     );
 
-    my $filename = $neb->create( "foo", 0, "node01" );
+    my $uri = $neb->create("foo", 0, "node01");
 
-    ok( -e $filename, "good filename" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "good filename");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -67,7 +75,9 @@
     );
 
-    my $filename = $neb->create( "foo", 0, "node01", "this is foo" );
+    my $uri = $neb->create("foo", 0, "node01", "this is foo");
 
-    ok( -e $filename, "good filename" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "good filename");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -79,6 +89,6 @@
     );
 
-    $neb->create( "foo" );
-    is( $neb->create( "foo" ), undef, "object already exists" );
+    $neb->create("foo");
+    is($neb->create("foo"), undef, "object already exists");
 }
 
@@ -92,5 +102,5 @@
     $neb->create();
 };
-like( $@, qr/2 - 4 were expected/, "no params" );
+like($@, qr/2 - 4 were expected/, "no params");
 
 Test::Nebulous->setup;
@@ -101,7 +111,7 @@
     );
 
-    $neb->create( 1, 2, 3, 4, 5 );
+    $neb->create(1, 2, 3, 4, 5);
 };
-like( $@, qr/2 - 4 were expected/, "too many params" );
+like($@, qr/2 - 4 were expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: /trunk/Nebulous/t/51_client_open_create.t
===================================================================
--- /trunk/Nebulous/t/51_client_open_create.t	(revision 12959)
+++ /trunk/Nebulous/t/51_client_open_create.t	(revision 12960)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 51_client_open_create.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+# $Id: 51_client_open_create.t,v 1.2 2007-04-23 20:42:29 jhoblitt Exp $
 
 use strict;
@@ -14,6 +14,6 @@
 use lib qw( ./t ./lib );
 
+#use Nebulous::Client trace => 'debug';
 use Nebulous::Client;
-use Nebulous::Util qw( :standard );
 use Test::Nebulous;
 
@@ -28,7 +28,7 @@
     );
 
-    my $fh = $neb->open_create( "foo" );
+    my $fh = $neb->open_create("foo");
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    is(ref $fh, 'GLOB', "good filehandle");
 }
 
@@ -43,5 +43,5 @@
     my $fh = $neb->open_create( "foo", 0 );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    is(ref $fh, 'GLOB', "good filehandle");
 }
 
@@ -54,7 +54,7 @@
     );
 
-    my $fh = $neb->open_create( "foo", 0, "node01" );
+    my $fh = $neb->open_create("foo", 0, "node01");
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    is(ref $fh, 'GLOB', "good filehandle");
 }
 
@@ -67,7 +67,7 @@
     );
 
-    my $fh = $neb->open_create( "foo", 0, "node01", "this is foo" );
+    my $fh = $neb->open_create("foo", 0, "node01", "this is foo");
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    is(ref $fh, 'GLOB', "good filehandle");
 }
 
@@ -79,6 +79,6 @@
     );
 
-    $neb->open_create( "foo" );
-    is( $neb->open_create( "foo" ), undef, "object already exists" );
+    $neb->open_create("foo");
+    is($neb->open_create("foo"), undef, "object already exists");
 }
 
@@ -92,5 +92,5 @@
     $neb->open_create();
 };
-like( $@, qr/2 - 4 were expected/, "no params" );
+like($@, qr/2 - 4 were expected/, "no params");
 
 Test::Nebulous->setup;
@@ -101,7 +101,7 @@
     );
 
-    $neb->open_create( 1, 2, 3, 4, 5 );
+    $neb->open_create(1, 2, 3, 4, 5);
 };
-like( $@, qr/2 - 4 were expected/, "too many params" );
+like($@, qr/2 - 4 were expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: /trunk/Nebulous/t/Test/Nebulous.pm
===================================================================
--- /trunk/Nebulous/t/Test/Nebulous.pm	(revision 12959)
+++ /trunk/Nebulous/t/Test/Nebulous.pm	(revision 12960)
@@ -1,5 +1,5 @@
 # Copyright (C) 2004  Joshua Hoblitt
 #
-# $Id: Nebulous.pm,v 1.8 2005-11-10 21:30:32 jhoblitt Exp $
+# $Id: Nebulous.pm,v 1.9 2007-04-23 20:42:29 jhoblitt Exp $
 
 package Test::Nebulous;
@@ -37,9 +37,12 @@
 
     # FIXME
-    $dbh->do( qq{ INSERT INTO volume VALUES (1,'node01',?) }, undef, 'file:' . $dir1 );
-    $dbh->do( qq{ INSERT INTO volume VALUES (2,'node02',?) }, undef, 'file:' . $dir2 );
+    $dbh->do(qq{ INSERT INTO volume VALUES (1,'node01',?) }, undef, $dir1);
+    $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e7) }, undef, $dir1);
 
-    $dbh->do( qq{ INSERT INTO class VALUES (0, 0, "regular data") } );
-    $dbh->do( qq{ INSERT INTO class VALUES (1, 1, "special data") } );
+    $dbh->do(qq{ INSERT INTO volume VALUES (2,'node02',?) }, undef, $dir2);
+    $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e10) }, undef, $dir2);
+
+    $dbh->do(qq{ INSERT INTO class VALUES (0, 0, "regular data") });
+    $dbh->do(qq{ INSERT INTO class VALUES (1, 1, "special data") });
 }