added integration tests for Choice