Switch from error to errorlist where appropriate
Fix error_test