Added test templates and archetypes