Adding choice trait and basic test