Potentially infinite loop in check_expected_crash_and_restart 
Replace with finite loop and some additional logic