Fix specs relying on subject_set.name