Add basic support for multiple choice tests