Fix test sets