Reorganized test structure