Fix ordering on test lockup.
Add final times to wait to help prevent lockups.
Use a better retry with a deadline to ensure we return at a reasonable time.