add choice validation and associated test and message.