fixed branch one, branch all, branch none tests

added some branch tests, broken branch survey, fixed some errors I found
in survey representation through testing