fix for infinite waitFor
Merge branch 'aynctests-wait'