Uncommenting tests, adding voting tests