Bug 1098193 - Part 2: Fix tests: using waiting state. r=hsinyi