More work on TestRebalance