Adds tests for Choices class.
Merge pull request #1 from davidwtbuxton/choices-tests

Adds tests for Choices class.

Thanks David!