Test updates to templating class