Updated template files
Updated tests