fixes #586 add path to template
fix website tests
Merge branch 'enhancement/586' into develop