Reorganize test