Fix some failing tests following recent labeling changes.