Reincorporating some branch tests