error handler test cleanups
wip