Added the vote model back
Tests
Moving models about
Disabled test for vote
Moved stuff around again