Made a few more changes to the templates to enable better testing.