Add template options

Overhaul tests too nbd
update labels test
Add test for template config option
2.4.0