Better tests and added VotedFor serialization