Topic/template simple

I think that it might be good to cherry pick the test? If relevant I can prepare a clean PR.