updated yml templates, testing