Jimmy - Added tests for templates