Add the beginnings of bulkretry tests.  Other minor changes.