Rewrite of templating tests