HV-738 Ensuring validationAppliesTo() is correctly used