Moved to multiple branch support. Old unit tests pass, but new ones not
written yet.
Add first test for multiple branches