Reorganize test dataset