Update bundle and add tests for choices, etc