Also correct Run.branch name
Add unit tests for branch and suite correction