Update the TestCase and remove unused error handlers