Fix some more flakey tests

Commit

8 years ago

Fix some more flakey tests switch a bunch of `flush()`es to `flushAllExpected()`s