[Story]Fix flaky unit tests

Uncategorized