Add choice operator to strategies and basic multi-term support in testing.