o Fix indentation in template
o Add separate test for Exisiting-Object Mappings