Choice improvements & tests