Restructuring
Fixing path to templates in tests