fix for tp #868 + tests of choice list
Merge pull request #237 from kobotoolbox/tp868

fix for tp #868 + tests of choice list