Use BLANK_CHOICE_DASH in tests