Fixed broken unit tests from the merge.
Merge branch 'dev' of https://github.com/antinodes/VotingInfoApp into working
fixed problems with tests after merging