Fix semicolons in templates and ensure test templates are generated.
Merge pull request #3 from ehelms/fix-templates

Fix semicolons in templates and ensure test templates are generated.