Fixes the broken tests
Merge branch 'emltemplate'