Setup basic templating, update tests