Add more task-level tests for retries and other errors.  Respond to initial comments.