Crea template: Cleanup tense/testcases