Index: trunk/Nebulous-Server/t/09_server_delete_instance.t
===================================================================
--- trunk/Nebulous-Server/t/09_server_delete_instance.t	(revision 24558)
+++ trunk/Nebulous-Server/t/09_server_delete_instance.t	(revision 24637)
@@ -8,5 +8,5 @@
 use warnings FATAL => qw( all );
 
-use Test::More tests => 8;
+use Test::More tests => 11;
 
 use lib qw( ./t ./lib );
@@ -20,4 +20,6 @@
     dbpasswd    => $NEB_PASS,
 );
+
+use Test::DBUnit dsn => $NEB_DB, username => $NEB_USER, password => $NEB_PASS;
 
 Test::Nebulous->setup;
@@ -44,4 +46,27 @@
 
     ok($neb->delete_instance($key, $uri2), "delete instance");
+
+    eval {
+        $neb->find_instances($key);
+    };
+    like($@, qr/is valid object key/, "storage object was deleted");
+}
+
+Test::Nebulous->setup;
+
+{
+    my $key = "foo";
+    my $uri1 = $neb->create_object($key, 'node01');
+    my $uri2 = $neb->replicate_object($key, 'node2');
+
+    # make one of the instances unavailable
+    my $dbh = test_dbh();
+    $dbh->do("UPDATE mountedvol SET available = 0 WHERE name = 'node01'");
+
+    ok($neb->delete_instance($key, $uri2), "delete instance");
+
+    expected_dataset_ok(
+        deleted => [vol_id => 1, uri => $uri1],
+    );
 
     eval {