Restructure tests for clarity.
Add test for concurrency of branch updates.