Added test for the extra choices functionality