Removing mixed test that no longer makes sense in auto_publish world
Addressed TODOs in test_branch_setting