Added tests for templating