Added a small section on branching.
A number of small changes to the testing files.