Improved errorformat
Added more errors to error test