Fix errorhandler test
Fix headers