Refactor Category model
Refactor User and Video tests & ditch FactoryGirl altogether