Improve mock/tests for GetBranch (re #123)