[BUGFIX] Make a flaky test not timing-sensitive anymore

[oliverklee]

Also clean up another test and make the timing-related tests more strict.

Fixes #2130