Adding FactoryGirl in replacement of fixtures