Tests complete, with one pending on voteable type
Merge branch 'Vote_model_testing'