Added FactoryGirl and deleted TestFactories