Merge "Update tests for new isValidationRequired args"