Reorganize test globals