Refactoring for the template to better match the functional tests. Test rendering the correct values.