Use lines instead of split-bla
Add more tests for RemoteBranchManager