Use template_dir in YamlAssistant to get proper path to templates
Fix the tests after introducing template_dir