diff --git a/test/ANALYSIS b/test/ANALYSIS
index db5bbf703..13d882d5b 100644
--- a/test/ANALYSIS
+++ b/test/ANALYSIS
@@ -18,6 +18,3 @@ FH merge fails because of missing undo.data in data dirs.
 FH 'task info' shows tasks from the completed.data file when doing a filter on the ID
    could it be confused and interpretes this as an UUID
 
-* bug.concat.t
-PB The word 'original' is parsed as 'or'(operator) ' '(space) 'iginal'(word).
-
diff --git a/test/op_and.t b/test/op_and.t
index e8f07d98c..35cc3397b 100755
--- a/test/op_and.t
+++ b/test/op_and.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 31;
+use Test::More tests => 26;
 
 # Create the rc file.
 if (open my $fh, '>', 'op.rc')
@@ -83,23 +83,13 @@ unlike ($output, qr/three/, 'ls project:A priority:H --> !three');
 unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
 
 # 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 'op.rc';
-ok (!-r 'op.rc', 'Removed op.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key op.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'op.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/op_gt.t b/test/op_gt.t
index 109c64c09..728b741e4 100755
--- a/test/op_gt.t
+++ b/test/op_gt.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 27;
+use Test::More tests => 22;
 
 # Create the rc file.
 if (open my $fh, '>', 'op.rc')
@@ -77,23 +77,13 @@ like   ($output, qr/three/, 'ls description > t --> three');
 unlike ($output, qr/four/,  'ls description > t --> !four');
 
 # 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 'op.rc';
-ok (!-r 'op.rc', 'Removed op.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key op.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'op.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/op_gte.t b/test/op_gte.t
index 161a6c33e..cd7eb2462 100755
--- a/test/op_gte.t
+++ b/test/op_gte.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 15;
+use Test::More tests => 10;
 
 # Create the rc file.
 if (open my $fh, '>', 'op.rc')
@@ -59,23 +59,13 @@ like   ($output, qr/three/, 'ls description >= t --> three');
 unlike ($output, qr/four/,  'ls description >= t --> !four');
 
 # 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 'op.rc';
-ok (!-r 'op.rc', 'Removed op.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key op.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'op.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/op_lt.t b/test/op_lt.t
index e6ee4b1e8..c89b9665b 100755
--- a/test/op_lt.t
+++ b/test/op_lt.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 27;
+use Test::More tests => 22;
 
 # Create the rc file.
 if (open my $fh, '>', 'op.rc')
@@ -77,23 +77,13 @@ unlike ($output, qr/three/, 'ls description < t --> !three');
 like   ($output, qr/four/,  'ls description < t --> four');
 
 # 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 'op.rc';
-ok (!-r 'op.rc', 'Removed op.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key op.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'op.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/op_lte.t b/test/op_lte.t
index c35bec6e3..59c15632a 100755
--- a/test/op_lte.t
+++ b/test/op_lte.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 15;
+use Test::More tests => 10;
 
 # Create the rc file.
 if (open my $fh, '>', 'op.rc')
@@ -59,23 +59,13 @@ unlike ($output, qr/three/, 'ls description <= t --> !three');
 like   ($output, qr/four/,  'ls description <= t --> four');
 
 # 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 'op.rc';
-ok (!-r 'op.rc', 'Removed op.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key op.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'op.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/op_or.t b/test/op_or.t
index 1ae12d255..131fcce2d 100755
--- a/test/op_or.t
+++ b/test/op_or.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 23;
+use Test::More tests => 18;
 
 # Create the rc file.
 if (open my $fh, '>', 'op.rc')
@@ -71,23 +71,13 @@ like   ($output, qr/three/, 'ls project=A or priority=H --> three');
 unlike ($output, qr/four/,  'ls project=A or priority=H --> !four');
 
 # 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 'op.rc';
-ok (!-r 'op.rc', 'Removed op.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key op.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'op.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/op_xor.t b/test/op_xor.t
index 7fbf1244a..78ed8381c 100755
--- a/test/op_xor.t
+++ b/test/op_xor.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 23;
+use Test::More tests => 18;
 
 # Create the rc file.
 if (open my $fh, '>', 'op.rc')
@@ -71,23 +71,13 @@ like   ($output, qr/three/, 'ls project=A priority=H --> three');
 unlike ($output, qr/four/,  'ls project=A priority=H --> !four');
 
 # 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 'op.rc';
-ok (!-r 'op.rc', 'Removed op.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key op.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'op.rc', 'Cleanup');
 
 exit 0;