Modified template usage

- Created new Template case class to pair modifier with rendered template
- Updated tests for template generation