Update control flow tests after change in error reporting