slight testing structure rearrangement