Add test for the alternative --choice options