chore: fix SDK change, improve style and tests in scheduled rebalancing found after approving previous PR #1284