Merge "Fix some unit tests flakiness"