Rework tests that didn’t work when multiple clients run at once.