Merge "API tests: Don't depend on template versions >mitaka"