Fix more hanging test. Mostly timing issues.