More edits to testing of valid choices.