include templates so tests work
Merge branch 'patch-1'