fixed conversion from number ctor bug in choice
improved choice tests