add retries to a couple of tests
Merge branch 'master' into batch-incidents