Updated ErrorHandler and test so that it doesn't echo in a test situation