error handler test cleanups