Add more rebalance-related tests