Reorganized templates and test configurations