refactor multiple choice tests