Adding choice spec
Lots and lots and lots of testing