Moving more tests to retry logic.