Add waitUpdates helper to tests for synchronization

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Add drain to Unwatch to prevent deadlocks

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>