Tests and tweaks for choice fields