Refactored ChoicePoint tests