Adds back and modifies test for template data