Update choices to new format, add tests