Reorganize test structure