Revert "bug in render, change in template was not causing re-render"

This reverts commit 5652ce8f924b13fa618e5a2ae0abaac6bf166c88.
Revert "Revert "bug in render, change in template was not causing re-render""

This reverts commit f01c656995be35464d487281b53ca50cb5df2f1a.
integration tests