add more checking/waiting to the unstable tests
Merge pull request #1316 from lzhan/next

add more checking/waiting to the unstable tests