improve Validate & test
rename containerTemplates