Changed way train/test sets were made