Add choice state tests (forgot to add it in a previous commit)