reorganized existing testcase templates