fix tests that relied on order of events

[BertKleewein]

[codecov[bot]]

Codecov Report

Patch and project coverage have no change.

Comparison is base (b544a47) 86.22% compared to head (79d60c7) 86.22%.

:exclamation: Current head 79d60c7 differs from pull request most recent head c08c7c3. Consider uploading reports for the commit c08c7c3 to get more accurate results

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1534   +/-   ##
=======================================
  Coverage   86.22%   86.22%           
=======================================
  Files          13       13           
  Lines        1321     1321           
=======================================
  Hits         1139     1139           
  Misses        182      182           

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Do you have feedback about the report comment? Let us know in this issue.

[BertKleewein]

@robertsLando - yes, this is ready for review.

[robertsLando]

@BertKleewein Should this fix flaky tests problem? I noticed that sometime tests fail with no reason

[robertsLando]

@BertKleewein kindly ping

[BertKleewein]

@robertsLando - it should fix some flaky tests. I don't know if it will fix the flaky tests that you were seeing though. :)

[BertKleewein]

@robertsLando - ready again. I think this second set of changes really improves these tests. I found a few things that might explain general flakiness.