diff --git a/test/bug.837.t b/test/bug.837.t
index c24d1a487..ffc069c22 100755
--- a/test/bug.837.t
+++ b/test/bug.837.t
@@ -36,10 +36,6 @@ from basetest import Task, TestCase
 
 
 class TestBug837(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        """Executed once before any test in the class"""
-
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
diff --git a/test/bug.annual.t b/test/bug.annual.t
index e8db05d5e..f592cf845 100755
--- a/test/bug.annual.t
+++ b/test/bug.annual.t
@@ -36,10 +36,6 @@ from basetest import Task, TestCase
 
 
 class TestBugAnnual(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        """Executed once before any test in the class"""
-
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
diff --git a/test/bug.cal.t b/test/bug.cal.t
index 067a264f7..5e79aedac 100755
--- a/test/bug.cal.t
+++ b/test/bug.cal.t
@@ -48,65 +48,65 @@ if (open my $fh, '>', $rc)
 
 # Should not fail (because they are correct):
 my $output = qx{../src/task rc:$rc cal 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal");
 
 # y due 2010 donkey 8
 $output = qx{../src/task rc:$rc cal y 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y");
 $output = qx{../src/task rc:$rc cal 8 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 8");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 8");
 $output = qx{../src/task rc:$rc cal due 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal due");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal due");
 $output = qx{../src/task rc:$rc cal 2010 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 2010");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 2010");
 $output = qx{../src/task rc:$rc cal donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal donkey");
 
 # y due 2010 donkey 8
 $output = qx{../src/task rc:$rc cal y due 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y due");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y due");
 $output = qx{../src/task rc:$rc cal y 8 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y 8");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y 8");
 $output = qx{../src/task rc:$rc cal y 2010 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y 2010");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y 2010");
 $output = qx{../src/task rc:$rc cal y donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y donkey");
 $output = qx{../src/task rc:$rc cal 8 due 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 8 due");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 8 due");
 $output = qx{../src/task rc:$rc cal 8 2010 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 8 2010");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 8 2010");
 $output = qx{../src/task rc:$rc cal 8 donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 8 donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 8 donkey");
 $output = qx{../src/task rc:$rc cal due 2010 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal due 2010");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal due 2010");
 $output = qx{../src/task rc:$rc cal due donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal due donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal due donkey");
 $output = qx{../src/task rc:$rc cal 2010 donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 2010 donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 2010 donkey");
 
 # y 8 due 2010 donkey
 $output = qx{../src/task rc:$rc cal y 8 due 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y 8 due");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y 8 due");
 $output = qx{../src/task rc:$rc cal y 8 2010 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y 8 2010");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y 8 2010");
 $output = qx{../src/task rc:$rc cal y 8 donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y 8 donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y 8 donkey");
 $output = qx{../src/task rc:$rc cal y due 2010 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y due 2010");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y due 2010");
 $output = qx{../src/task rc:$rc cal y due donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y due donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y due donkey");
 $output = qx{../src/task rc:$rc cal y 2010 donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal y 2010 donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal y 2010 donkey");
 $output = qx{../src/task rc:$rc cal 8 due 2010 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 8 due 2010");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 8 due 2010");
 $output = qx{../src/task rc:$rc cal 8 due donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 8 due donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 8 due donkey");
 $output = qx{../src/task rc:$rc cal 8 2010 donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal 8 2010 donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal 8 2010 donkey");
 $output = qx{../src/task rc:$rc cal due 2010 8 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal due 2010 8");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal due 2010 8");
 $output = qx{../src/task rc:$rc cal due 2010 donkey 2>&1};
-unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, "$ut: cal due 2010 donkey");
+unlike ($output, qr/(?:Assertion failed|Could not recognize|not a valid)/, "$ut: cal due 2010 donkey");
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data), $rc;
diff --git a/test/bug.sort.t b/test/bug.sort.t
deleted file mode 100755
index 04f69b7a1..000000000
--- a/test/bug.sort.t
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /usr/bin/env perl
-################################################################################
-##
-## Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included
-## in all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-## SOFTWARE.
-##
-## http://www.opensource.org/licenses/mit-license.php
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 2;
-
-# Ensure environment has no influence.
-delete $ENV{'TASKDATA'};
-delete $ENV{'TASKRC'};
-
-use File::Basename;
-my $ut = basename ($0);
-my $rc = $ut . '.rc';
-
-# Create the rc file.
-if (open my $fh, '>', $rc)
-{
-  print $fh "data.location=.\n";
-  close $fh;
-}
-
-my $setup = "../src/task rc:$rc add one 2>&1;"
-          . "../src/task rc:$rc add two 2>&1;"
-          . "../src/task rc:$rc add three recur:daily due:eom 2>&1;";
-qx{$setup};
-
-my $output = qx{../src/task rc:$rc list 2>&1};
-like ($output, qr/three.*(?:one.*two|two.*one)/msi, "$ut: list did not hang");
-
-qx{../src/task rc:$rc 1 modify priority:H 2>&1};
-$output = qx{../src/task rc:$rc list 2>&1};
-like ($output, qr/three.*one.*two/msi, "$ut: list did not hang after pri:H on 1");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/history.t b/test/history.t
index b9996bedb..f2e47e977 100755
--- a/test/history.t
+++ b/test/history.t
@@ -36,10 +36,6 @@ from basetest import Task, TestCase
 
 
 class TestHistoryMonthly(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        """Executed once before any test in the class"""
-
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()