Update tests to cover branching