Fix rspec tests because of the changes to the cfp

Remove redundant association
Note: a conference created with :full_conference already has a cfp

spec/factories/cfps.rb

@@ -4,6 +4,7 @@ FactoryGirl.define do
   factory :cfp do
     start_date { 1.day.ago }
     end_date { 6.days.from_now }
+    cfp_type 'events'
 
     program
   end

spec/factories/programs.rb

@@ -5,5 +5,9 @@ FactoryGirl.define do
     schedule_public false
     schedule_fluid false
     conference
+
+    trait :with_cfp do
+      after(:create) { |program| create(:cfp, program: program) }
+    end
   end
 end