Fix race conditions in tests

[martintmk]

Details on the issue fix or feature implementation

Closes #1357 (or at least I hope so :))

Confirm the following

• I started this PR by branching from the head of the default branch
• I have targeted the PR to merge into the default branch
• I have included unit tests for the issue/feature
• I have successfully run a local build

[codecov]

Codecov Report

Merging #1358 (60deab7) into main (faaf2ee) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1358   +/-   ##
=======================================
  Coverage   83.51%   83.51%           
=======================================
  Files         268      268           
  Lines        6362     6362           
  Branches      999      999           
=======================================
  Hits         5313     5313           
  Misses        840      840           
  Partials      209      209           

Flag	Coverage Δ
linux	?
macos	83.51% <ø> (ø)
windows	83.51% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.