Added some testing for templates