Merge training and test sets