Message Bridge tests are flaky

I keep hitting random failures.  Make the tests more robust.  Any other instances of these failing would be appreciated too.

So far, every failure looks like a flaky test, not a bug in the code.