Isolated branch name, errors return in list
Removed commented code
Fix test