Errors have new structure; re-re-wrote tests for it