Refactoring MessageBuilder to use a TemplateBuilder helper
Moving Fixtures into unit/integration test shared library for TemplateBuilder