Update test templates from 2.2.2xx branch
Update test templates from 2.2.2xx branch

johnbeisner/cli,livarcocc/cli-1,dasMulli/cli,johnbeisner/cli,livarcocc/cli-1,dasMulli/cli,dasMulli/cli,johnbeisner/cli,livarcocc/cli-1