Added possible fix for rebalance tests random failures