Bugfix in BulkRetry
Plus, make the simple test more stringent