Enabled tests in develop
Added cross-zone templates support