Tests & tweaks for ChoiceField