Branches spec refactoring