fix for tp #868 + tests of choice list