Add more tests for shorten_choices.
Fix bug in construction of value for shortened choices.