Vote controller tests
Fixed merge conflict in vote tests