Fixed #1533 - Resolved issue with integer keys on nested choices never validating.

- Added unit test for nested `choices` argument.
- Added unit test for non-nested `choices` argument.
Merge pull request #1844 from adamsc64/issue_1533

Fixed #1533 - Resolved issue with integer keys on nested choices never v...