Fix runtest macro
Add branch tests