Index: t/tools/ops2pmutils/08-sort_ops.t
===================================================================
--- t/tools/ops2pmutils/08-sort_ops.t	(revision 29542)
+++ t/tools/ops2pmutils/08-sort_ops.t	(working copy)
@@ -26,7 +26,7 @@
 use File::Temp (qw| tempdir |);
 
 my $cwd = cwd();
-plan -e "$cwd/DEVELOPING" ? ( tests => 86 ) :
+plan -e "$cwd/DEVELOPING" ? ( tests => 82 ) :
                             ( skip_all => 'Requires DEVELOPING file' );
 
 use_ok('Parrot::Ops2pm::Utils');
@@ -75,7 +75,7 @@
         ok( -f $num,                    "ops.num located after renumbering" );
         ok( -f $skip,                   "ops.skip located after renumbering" );
 
-        ok( $self->sort_ops(), "sort_ops returned successfully" );
+        $self->sort_ops();
 
         # To do:  Test that the sorting was correct.
 
@@ -122,7 +122,7 @@
         ok( -f $num,                    "ops.num located after renumbering" );
         ok( -f $skip,                   "ops.skip located after renumbering" );
 
-        ok( $self->sort_ops(), "sort_ops returned successfully" );
+        $self->sort_ops();
 
         # To do:  Test that the sorting was correct.
 
@@ -176,7 +176,7 @@
             \$stdout,
             \$stderr
         );
-        ok($ret, "sort_ops returned successfully" );
+
 #  TODO: {
 #             local $TODO = 'broken warning about experimental ops';
 
@@ -310,7 +310,7 @@
             \$stdout,
             \$stderr
         );
-        ok($ret, "sort_ops returned successfully" );
+
         ok( ! $stderr, "Got no warning, as expected" );
 
         # To do:  Test that the sorting was correct.
Index: t/tools/ops2pmutils/10-print_module.t
===================================================================
--- t/tools/ops2pmutils/10-print_module.t	(revision 29542)
+++ t/tools/ops2pmutils/10-print_module.t	(working copy)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 42;
+use Test::More tests => 38;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
@@ -73,9 +73,9 @@
         ok( -f $num,                    "ops.num located after renumbering" );
         ok( -f $skip,                   "ops.skip located after renumbering" );
 
-        ok( $self->sort_ops(), "sort_ops returned successfully" );
+        $self->sort_ops();
 
-        ok( $self->prepare_real_ops(), "prepare_real_ops() returned successfully" );
+        $self->prepare_real_ops();
 
         ok( $self->print_module(), "print_module() returned true" );
         ok( -f qq{$tdir/$self->{moddir}/$self->{module}}, "core.pm file written" );
@@ -129,9 +129,9 @@
         ok( -f $num,                    "ops.num located after renumbering" );
         ok( -f $skip,                   "ops.skip located after renumbering" );
 
-        ok( $self->sort_ops(), "sort_ops returned successfully" );
+        $self->sort_ops();
 
-        ok( $self->prepare_real_ops(), "prepare_real_ops() returned successfully" );
+        $self->prepare_real_ops();
 
         ok( $self->print_module(), "print_module() returned true" );
         ok( -f qq{$tdir/$self->{moddir}/$self->{module}}, "core.pm file written" );
Index: t/tools/ops2pmutils/11-print_h.t
===================================================================
--- t/tools/ops2pmutils/11-print_h.t	(revision 29542)
+++ t/tools/ops2pmutils/11-print_h.t	(working copy)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 23;
+use Test::More tests => 21;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
@@ -71,10 +71,9 @@
         ok( -f $num,                    "ops.num located after renumbering" );
         ok( -f $skip,                   "ops.skip located after renumbering" );
 
-        ok( $self->sort_ops(), "sort_ops returned successfully" );
+        $self->sort_ops();
+        $self->prepare_real_ops();
 
-        ok( $self->prepare_real_ops(), "prepare_real_ops() returned successfully" );
-
         ok( $self->print_module(), "print_module() returned true" );
         ok( -f qq{$tdir/$self->{moddir}/$self->{module}}, "core.pm file written" );
 
Index: t/tools/ops2pmutils/09-prepare_real_ops.t
===================================================================
--- t/tools/ops2pmutils/09-prepare_real_ops.t	(revision 29542)
+++ t/tools/ops2pmutils/09-prepare_real_ops.t	(working copy)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 38;
+use Test::More tests => 35;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
@@ -68,9 +68,9 @@
         ok( -f $num,                    "ops.num located after renumbering" );
         ok( -f $skip,                   "ops.skip located after renumbering" );
 
-        ok( $self->sort_ops(), "sort_ops returned successfully" );
+        $self->sort_ops();
 
-        ok( $self->prepare_real_ops(), "prepare_real_ops() returned successfully" );
+        $self->prepare_real_ops();
 
         ok( chdir $cwd, 'changed back to starting directory after testing' );
     }
@@ -143,7 +143,7 @@
         ok( -f $num,                    "ops.num located after renumbering" );
         ok( -f $skip,                   "ops.skip located after renumbering" );
 
-        ok( $self->sort_ops(), "sort_ops returned successfully" );
+	$self->sort_ops();
 
         eval { $self->prepare_real_ops(); };