Make default branch the current branch
Fix tests
Simplify on a feature branch