Fix some test flakiness (in a second place).