Added @wpreul code for better branch tracking

updated tests accordingly
updated reporter