simplify and multiple retry
add too many retries test case