try to make the tests a bit more robust
add wait_until