CHOICE placeholder added (including some tests)
Example project updated