Reorgaize test layout