Testing tests

app/models/conference.rb

@@ -10,6 +10,8 @@ class Conference < ActiveRecord::Base
 	has_many :conference_registration_form_fields, :order => 'position ASC', :dependent => :destroy#, :class_name => '::ConferenceRegistrationFormField'
 	has_many :registration_form_fields, :through => :conference_registration_form_fields
 
+	has_many :workshops
+
 	accepts_nested_attributes_for :conference_host_organizations, :reject_if => proc {|u| u[:organization_id].blank?}, :allow_destroy => true
 
 	def to_param

app/models/workshop.rb

@@ -1,2 +1,7 @@
 class Workshop < ActiveRecord::Base
+    belongs_to :conference
+
+    def to_param
+        slug
+    end
 end