(1) Re-structure tests to do one "extend" action at a time (2) Re-try test till max limit before final failure