SiteTemplateJson now generating templateKey-s instead of templateName-s so that the needed ModuleName is available
Fixed test