Fix choice encoding

Fixes bug #15 - choice encoding had no tests and was broken
Is there a point of duplicating this in DER tests?