added test retries for some flaky tests