Adds tests for Choices class.

Hi,

Some tests for choices.

Dave.