Reorganize test templates