Fix tests to use full template names