Index: trunk/Nebulous-Server/t/09_server_stat_object.t
===================================================================
--- trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 17716)
+++ trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 17717)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.14 2008-05-13 03:55:08 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.15 2008-05-16 20:29:19 jhoblitt Exp $
 
 use strict;
@@ -49,8 +49,8 @@
 Test::Nebulous->setup;
 
-{
+eval {
     my $stat = $neb->stat_object("foo");
-    is($stat, undef, "object does not exist");
-}
+};
+like($@, qr/is valid object key/, "no params");
 
 Test::Nebulous->setup;
Index: trunk/Nebulous-Server/t/12_server_find_objects.t
===================================================================
--- trunk/Nebulous-Server/t/12_server_find_objects.t	(revision 17716)
+++ trunk/Nebulous-Server/t/12_server_find_objects.t	(revision 17717)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 12_server_find_objects.t,v 1.3 2008-03-20 21:10:14 jhoblitt Exp $
+# $Id: 12_server_find_objects.t,v 1.4 2008-05-16 20:29:19 jhoblitt Exp $
 
 use strict;
@@ -24,12 +24,11 @@
 
 # search for a regex of '' should match nothing
-{
+eval {
     # key
     my $uri = $neb->create_object("foo");
 
     my $keys = $neb->find_objects();
-
-    is(scalar @$keys, 0, 'number of keys found');
-}
+};
+like($@, qr/no keys found/, "no keys found");
 
 Test::Nebulous->setup;
Index: trunk/Nebulous-Server/t/13_server_rename_object.t
===================================================================
--- trunk/Nebulous-Server/t/13_server_rename_object.t	(revision 17716)
+++ trunk/Nebulous-Server/t/13_server_rename_object.t	(revision 17717)
@@ -3,5 +3,5 @@
 # Copryight (C) 2007  Joshua Hoblitt
 #
-# $Id: 13_server_rename_object.t,v 1.4 2008-03-20 21:10:14 jhoblitt Exp $
+# $Id: 13_server_rename_object.t,v 1.5 2008-05-16 20:29:19 jhoblitt Exp $
 
 use strict;
@@ -28,7 +28,10 @@
     $neb->rename_object("foo", "bar");
 
-    my $keys = $neb->find_objects('^foo$');
-    is(scalar @$keys, 0, 'number of keys found');
-    $keys = $neb->find_objects('^bar$');
+    eval {
+        $neb->find_objects('^foo$');
+    };
+    like($@, qr/no keys found/, "old key name");
+
+    my $keys = $neb->find_objects('^bar$');
     is(scalar @$keys, 1, 'number of keys found');
 }