Addressed TODOs in test_branch_setting