refactored Choice tests