reorganize test layout