Fix more hanging test. More timing issues.