Refactored choice type test.