Fix for line lengths in choices

Also fixed test