add --test
Merge branch 'ft/flowtool-improvements'
branch_restoring
improve get_branch errors