Stabilize two test that seem to often fail on the CI

[laeubi]

• Use a timeout instead of static wait times
• retry diagnostics
• use a copy of the current state

This also reduces the test time from 5 sec to less than a second for the

TimeUnit.SECONDS.sleep(5); // HACK: to make the timing work on slow machines