add more retries around update remove tests