Merge "Deploy templates: add API tests"