Used camelCase, updated ChoiceMap. Successful tests for ChoiceMap