Create template: Cleanup merge/testcases