Fixed call to function in Choice and refactored unit test for Choice.