Index: trunk/Nebulous-Server/t/apache_03_server_create_object.x
===================================================================
--- trunk/Nebulous-Server/t/apache_03_server_create_object.x	(revision 4624)
+++ 	(revision )
@@ -1,95 +1,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use Apache::Test qw(-withtestmore);
-
-plan tests => 11;
-
-use lib qw( ./t ./lib );
-
-use Apache::TestUtil;
-use Nebulous::Util qw( :standard );
-use SOAP::Lite;
-use Test::Nebulous;
-
-my $hostport = Apache::Test::config()->{ 'hostport' };
-my $neb = SOAP::Lite->new(
-    proxy   => "http://$hostport/nebulous",
-    uri     => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server",
-);
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $uri = $neb->create_object( "foo" )->result;
-
-    ok( -e _get_file_path( $uri ), "file exists" );
-
-    like( $uri, qr/^file:\//, "valid URI" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class
-    my $uri = $neb->create_object( "foo", 0 )->result;
-    $neb->delete_instance( $uri );
-
-    ok( -e _get_file_path( $uri ), "file exists" );
-
-    like( $uri, qr/^file:\//, "valid URI" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume
-    my $uri = $neb->create_object( "foo", 0, "node01" )->result;
-    $neb->delete_instance( $uri );
-
-    ok( -e _get_file_path( $uri ), "file exists" );
-
-    like( $uri, qr/^file:\//, "valid URI" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume, comment
-    my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" )->result;
-    $neb->delete_instance( $uri );
-
-    ok( -e _get_file_path( $uri ), "file exists" );
-
-    like( $uri, qr/^file:\//, "valid URI" );
-}
-
-Test::Nebulous->setup;
-
-{
-    $neb->create_object( "foo" );
-    my $response = $neb->create_object( "foo" );
-
-    like( $response->faultstring, qr/Duplicate entry/, "object already exists" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $response = $neb->create_object();
-
-    like( $response->faultstring, qr/2 - 4 were expected/, "no params" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $response = $neb->create_object( 1, 2, 3, 4, 5 );
-
-    like( $response->faultstring, qr/2 - 4 were expected/, "too many params" );
-}
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/apache_04_server_replicate_object.x
===================================================================
--- trunk/Nebulous-Server/t/apache_04_server_replicate_object.x	(revision 4624)
+++ 	(revision )
@@ -1,86 +1,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use Apache::Test qw(-withtestmore);
-
-plan tests => 11;
-
-use lib qw( ./t ./lib );
-
-use Apache::TestUtil;
-use Nebulous::Util qw( :standard );
-use SOAP::Lite;
-use Test::Nebulous;
-
-my $hostport = Apache::Test::config()->{ 'hostport' };
-my $neb = SOAP::Lite->new(
-    proxy   => "http://$hostport/nebulous",
-    uri     => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server",
-);
-
-Test::Nebulous->setup;
-
-{
-    # key
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo" )->result;
-
-    ok( -e _get_file_path( $uri ), "file exists" );
-
-    like( $uri, qr/^file:\//, "valid URI" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, $volume
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo", "node01" )->result;
-
-    ok( -e _get_file_path( $uri ), "file exists" );
-
-    like( $uri, qr/^file:\//, "valid URI" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, $volume
-    $neb->create_object( "foo" );
-    my $uri1 = $neb->replicate_object( "foo", "node01" )->result;
-    my $uri2 = $neb->replicate_object( "foo", "node02" )->result;
-
-    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" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $response = $neb->replicate_object();
-
-    like( $response->faultstring, qr/1 - 2 were expected/, "no params" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $response = $neb->replicate_object( 1, 2, 3 );
-
-    like( $response->faultstring, qr/1 - 2 were expected/, "too many params" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $response = $neb->replicate_object( "foo" );
-
-    like( $response->faultstring, qr/storage object does not exist/, "storage object does not exist" );
-}
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/apache_05_server_lock_object.x
===================================================================
--- trunk/Nebulous-Server/t/apache_05_server_lock_object.x	(revision 4624)
+++ 	(revision )
@@ -1,129 +1,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use Apache::Test qw(-withtestmore);
-
-plan tests => 13;
-
-use lib qw( ./t ./lib );
-
-use Apache::TestUtil;
-use Nebulous::Util qw( :standard );
-use SOAP::Lite;
-use Test::Nebulous;
-
-my $hostport = Apache::Test::config()->{ 'hostport' };
-my $neb = SOAP::Lite->new(
-    proxy   => "http://$hostport/nebulous",
-    uri     => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server",
-);
-
-Test::Nebulous->setup;
-
-{
-    $neb->create_object( "foo" );
-
-    ok( $neb->lock_object( "foo", "read" )->result, "read lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    $neb->create_object( "foo" );
-
-    ok( $neb->lock_object( "foo", "read" )->result, "read lock" );
-    ok( $neb->lock_object( "foo", "read" )->result, "read lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    $neb->create_object( "foo" );
-
-    ok( $neb->lock_object( "foo", "write" )->result, "write lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $result = $neb->lock_object( "foo", "read" );
-
-    like( $result->faultstring, qr/storage object does not exist/, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $result = $neb->lock_object( "foo", "write" );
-
-    like( $result->faultstring, qr/storage object does not exist/, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-{
-    $neb->create_object( "foo" );
-
-    $neb->lock_object( "foo", "write" );
-    my $result = $neb->lock_object( "foo", "write" );
-
-    like( $result->faultstring, qr/can not write lock twice/, "can not write lock twice" );
-}
-
-Test::Nebulous->setup;
-
-{
-    $neb->create_object( "foo" );
-
-    $neb->lock_object( "foo", "read" );
-    my $result = $neb->lock_object( "foo", "write" );
-
-    like( $result->faultstring, qr/can not write lock after read lock/, "can not write lock after read lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    $neb->create_object( "foo" );
-
-    $neb->lock_object( "foo", "write" );
-    my $result = $neb->lock_object( "foo", "read" );
-
-    like( $result->faultstring, qr/can not read lock after write lock/, "can not read lock after write lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $result = $neb->lock_object();
-
-    like( $result->faultstring, qr/2 were expected/, "no params" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $result = $neb->lock_object( "foo" );
-
-    like( $result->faultstring, qr/2 were expected/, "not enough params" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $result = $neb->lock_object( "foo", "both" );
-
-    like( $result->faultstring, qr/is read or write/, "not read or write" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $result = $neb->lock_object( "foo", 'read', 3 );
-
-    like( $result->faultstring, qr/2 were expected/, "too many params" );
-}
-
-Test::Nebulous->cleanup;