Adding test for option entity_to_choice option
Update documentation