Added dependencies and testing code for templating