Renamed some things and created test for mapping TemplateObject