diff --git a/lib/validators/core_clinical_data_element_validator.rb b/lib/validators/core_clinical_data_element_validator.rb
index 05b13e34e..1aeb9424b 100644
--- a/lib/validators/core_clinical_data_element_validator.rb
+++ b/lib/validators/core_clinical_data_element_validator.rb
@@ -15,12 +15,7 @@ def validate(file, options = {})
       return unless ccde_measure_ids.intersect?(@test_measure_ids)
 
       doc = get_document(file)
-      case options.task._type
-      when 'CMSProgramTask'
-        verify_patient_ids(doc, options)
-      when 'C3Cat1Task'
-        verify_patient_ids(doc, options)
-      end
+      verify_patient_ids(doc, options) if %w[CMSProgramTask C3Cat1Task].include?(options.task._type)
       verify_encounters(doc, options)
     end
 
diff --git a/test/unit/lib/validators/program_validator_test.rb b/test/unit/lib/validators/program_validator_test.rb
index a2f258b8c..5fcaf9eb2 100644
--- a/test/unit/lib/validators/program_validator_test.rb
+++ b/test/unit/lib/validators/program_validator_test.rb
@@ -5,7 +5,7 @@ class ProgramValidatorTest < ActiveSupport::TestCase
   include ::Validators
 
   def setup
-    @validator = Validators::ProgramValidator.new('HQR_PI')
+    @validator = Validators::ProgramValidator.new(['HQR_PI'])
     file = File.new(Rails.root.join('test', 'fixtures', 'qrda', 'cat_I', 'sample_patient_good.xml')).read
     @document = get_document(file)
   end