Merge "Deploy templates: API test nits"