Reenable reorderBranch test and add better debug output