add more checking/waiting to the unstable tests