Adding a more complex test
Added branchTracking turned off by default and flag to activate it