Fix multiple choice items and associated tests