Refine testing structure further