Fix some unit tests flakiness

Test: run in loop
Change-Id: I8a4ad7bd86342ccd7fb8f57aa27b76182489df6e
2 files changed