Added multiple-choice tests