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

...alidating.

- Added unit test for nested `choices` argument.
- Added unit test for non-nested `choices` argument.