Reorganize test component