add more tests for choices