Reorganized testing structure