diff --git a/test/ANALYSIS b/test/ANALYSIS
index 2e48628cd..c5dfd8a8c 100644
--- a/test/ANALYSIS
+++ b/test/ANALYSIS
@@ -10,13 +10,6 @@ PB need to use a UTF-8 friendly way of doing input[--eol].
 * dependencies.t
 PB When running "task 1 dep:-2" the '-' is being considerd a binary op.
 
-* bug.480.t
-FH A3::is_tag related: +@strange is not seen as a tag
-
-* confirmation.t
-FH missing confirmations. CmdModify doesn't call context.config.getBoolean ("confirmation")
-   perhaps do the same as in Command::safety ()
-
 * merge.duplicate.t
 FH merge fails because of missing undo.data in data dirs.
    merge ignores URI then outputs wrong (???) msg ?????
diff --git a/test/bug.uuid.t b/test/bug.uuid.t
index 03cea7efc..39c7f5b52 100755
--- a/test/bug.uuid.t
+++ b/test/bug.uuid.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 9;
+use Test::More tests => 4;
 
 # Create the rc file.
 if (open my $fh, '>', 'uuid.rc')
@@ -44,11 +44,11 @@ if (open my $fh, '>', 'uuid.rc')
 qx{../src/task rc:uuid.rc add simple};
 qx{../src/task rc:uuid.rc 1 duplicate};
 qx{../src/task rc:uuid.rc add periodic recur:daily due:yesterday};
-my $output = qx{../src/task rc:uuid.rc stats};
+qx{../src/task rc:uuid.rc ls};
 
 my @all_uuids;
 my %unique_uuids;
-$output = qx{../src/task rc:uuid.rc 1 info};
+my $output = qx{../src/task rc:uuid.rc 1 info};
 my ($uuid) = $output =~ /UUID\s+(\S+)/;
 push @all_uuids, $uuid;
 $unique_uuids{$uuid} = undef;
@@ -82,23 +82,13 @@ is (scalar (@all_uuids), 6, '6 tasks created');
 is (scalar (keys %unique_uuids), 6, '6 unique UUIDs');
 
 # Cleanup.
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'uuid.rc';
-ok (!-r 'uuid.rc', 'Removed uuid.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key uuid.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'uuid.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/delete.t b/test/delete.t
index 5f9e03218..290910d5b 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -58,7 +58,7 @@ like ($output, qr/No matches./, 'No matches');
 ok (-r 'completed.data', 'completed.data created');
 
 $output = qx{../src/task rc:delete.rc info 1};
-like ($output, qr/No matches\./, 'No matches');
+like ($output, qr/No matches\./, 'No matches');  # 10
 
 # Add a task, delete it, and modify on the fly.
 qx{../src/task rc:delete.rc add one two};