Change tests for new template
Respond to henry's comments about the template